Merge tag 'pinctrl-v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

Pull pin control updates from Linus Walleij:
 "There is a lot going on!

  Core changes:

   - A semantic change to handle pinmux and pinconf in explicit order
     while up until now we depended on the semantic order in the device
     tree. The device tree is a functional programming language and does
     not imply any order, so the right thing is for the pin control core
     to provide these semantics.

   - Add a new pinmux-select debugfs file which makes it possible to go
     in and select functions for a pin manually (iteratively, at the
     prompt) for debugging purposes.

   - Fixes to gpio regmap handling for a new pin control driver making
     use of regmap-gpio.

   - Use octal permissions on debugfs files.

  New drivers:

   - A massive rewrite of the former custom pin control driver for MIPS
     Broadcom devices to instead use the pin control subsystem. New pin
     control drivers for BCM6345, BCM6328, BCM6358, BCM6362, BCM6368,
     BCM63268 and BCM6318 SoC variants are implemented.

   - Support for PM8350, PM8350B, PM8350C, PMK8350, PMR735A and PMR735B
     in the Qualcomm PMIC GPIO driver. Also the two GPIOs on PM8008 are
     supported.

   - Support for the Rockchip RK3568/RK3566 pin controller.

   - Support for Ingenic JZ4730, JZ4750, JZ4755, JZ4775 and X2000.

   - Support for Mediatek MTK8195.

   - Add a new Xilinx ZynqMP pin control driver.

  Driver improvements and non-urgent fixes:

   - Modularization and improvements of the Rockchip drivers.

   - Some new pins added to the description of new Renesas SoCs.

   - Clarifications of the GPIO base calculation in the Intel driver.

   - Fix the function names for the MPP54 and MPP55 pins in the Armada
     CP110 pin controller.

   - GPIO wakeup interrupt map for Qualcomm SC7280 and SM8350.

   - Support for ACPI probing of the Qualcomm SC8180x.

   - Fix interrupt clear status on rockchip

   - Fix some missing pins on the Ingenic JZ4770, some semantic fixes
     for the behaviour of the Ingenic pin controller. Add DMIC pins for
     JZ4780, X1000, X1500 and X1830.

   - A slew of janitorial like of_node_put() calls"

* tag 'pinctrl-v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (99 commits)
  pinctrl: Add Xilinx ZynqMP pinctrl driver support
  firmware: xilinx: Add pinctrl support
  pinctrl: rockchip: do coding style for mux route struct
  pinctrl: Add PIN_CONFIG_MODE_PWM to enum pin_config_param
  pinctrl: Introduce MODE group in enum pin_config_param
  pinctrl: Keep enum pin_config_param ordered by name
  dt-bindings: pinctrl: Add binding for ZynqMP pinctrl driver
  pinctrl: core: Fix kernel doc string for pin_get_name()
  pinctrl: mediatek: use spin lock in mtk_rmw
  pinctrl: add drive for I2C related pins on MT8195
  pinctrl: add pinctrl driver on mt8195
  dt-bindings: pinctrl: mt8195: add pinctrl file and binding document
  pinctrl: Ingenic: Add pinctrl driver for X2000.
  pinctrl: Ingenic: Add pinctrl driver for JZ4775.
  pinctrl: Ingenic: Add pinctrl driver for JZ4755.
  pinctrl: Ingenic: Add pinctrl driver for JZ4750.
  pinctrl: Ingenic: Add pinctrl driver for JZ4730.
  dt-bindings: pinctrl: Add bindings for new Ingenic SoCs.
  pinctrl: Ingenic: Reformat the code.
  pinctrl: Ingenic: Add DMIC pins support for Ingenic SoCs.
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/Kconfig.platforms
Simple merge

diff --cc drivers/firmware/xilinx/zynqmp.c
Simple merge

diff --cc drivers/pinctrl/core.c
Simple merge

diff --cc drivers/pinctrl/intel/pinctrl-intel.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-rockchip.c
Simple merge

diff --cc drivers/pinctrl/qcom/pinctrl-sc7280.c
index 9d41abf,99c416e..afddf6d
--- 1/drivers/pinctrl/qcom/pinctrl-sc7280.c
--- 2/drivers/pinctrl/qcom/pinctrl-sc7280.c
+++ b/drivers/pinctrl/qcom/pinctrl-sc7280.c
@@@ -1439,16 -1439,38 +1439,38 @@@ static const struct msm_pingroup sc7280
        [172] = PINGROUP(172, qdss, _, _, _, _, _, _, _, _),
        [173] = PINGROUP(173, qdss, _, _, _, _, _, _, _, _),
        [174] = PINGROUP(174, qdss, _, _, _, _, _, _, _, _),
 -      [175] = UFS_RESET(ufs_reset, 0x1be000),
 -      [176] = SDC_QDSD_PINGROUP(sdc1_rclk, 0x1b3000, 15, 0),
 -      [177] = SDC_QDSD_PINGROUP(sdc1_clk, 0x1b3000, 13, 6),
 -      [178] = SDC_QDSD_PINGROUP(sdc1_cmd, 0x1b3000, 11, 3),
 -      [179] = SDC_QDSD_PINGROUP(sdc1_data, 0x1b3000, 9, 0),
 -      [180] = SDC_QDSD_PINGROUP(sdc2_clk, 0x1b4000, 14, 6),
 -      [181] = SDC_QDSD_PINGROUP(sdc2_cmd, 0x1b4000, 11, 3),
 -      [182] = SDC_QDSD_PINGROUP(sdc2_data, 0x1b4000, 9, 0),
 +      [175] = UFS_RESET(ufs_reset, 0xbe000),
 +      [176] = SDC_QDSD_PINGROUP(sdc1_rclk, 0xb3004, 0, 6),
 +      [177] = SDC_QDSD_PINGROUP(sdc1_clk, 0xb3000, 13, 6),
 +      [178] = SDC_QDSD_PINGROUP(sdc1_cmd, 0xb3000, 11, 3),
 +      [179] = SDC_QDSD_PINGROUP(sdc1_data, 0xb3000, 9, 0),
 +      [180] = SDC_QDSD_PINGROUP(sdc2_clk, 0xb4000, 14, 6),
 +      [181] = SDC_QDSD_PINGROUP(sdc2_cmd, 0xb4000, 11, 3),
 +      [182] = SDC_QDSD_PINGROUP(sdc2_data, 0xb4000, 9, 0),
  };
  
+ static const struct msm_gpio_wakeirq_map sc7280_pdc_map[] = {
+       { 0, 134 }, { 3, 131 }, { 4, 121 }, { 7, 103 }, { 8, 155 },
+       { 11, 93 }, { 12, 78 }, { 15, 79 }, { 16, 80 }, { 18, 81 },
+       { 19, 107 }, { 20, 82 }, { 21, 83 }, { 23, 99 }, { 24, 86 },
+       { 25, 95 }, { 27, 158 }, { 28, 159 }, { 31, 90 }, { 32, 144 },
+       { 34, 77 }, { 35, 92 }, { 36, 157 }, { 39, 73 }, { 40, 97 },
+       { 41, 98 }, { 43, 85 }, { 44, 100 }, { 45, 101 }, { 47, 102 },
+       { 48, 74 }, { 51, 112 }, { 52, 156 }, { 54, 117 }, { 55, 84 },
+       { 56, 108 }, { 59, 110 }, { 60, 111 }, { 61, 123 }, { 63, 104 },
+       { 68, 127 }, { 72, 150 }, { 75, 133 }, { 77, 125 }, { 78, 105 },
+       { 79, 106 }, { 80, 118 }, { 81, 119 }, { 82, 162 }, { 83, 122 },
+       { 86, 75 }, { 88, 154 }, { 89, 124 }, { 90, 149 }, { 91, 76 },
+       { 93, 128 }, { 95, 160 }, { 101, 126 }, { 102, 96 }, { 103, 116 },
+       { 104, 114 }, { 112, 72 }, { 116, 135 }, { 117, 163 }, { 119, 137 },
+       { 121, 138 }, { 123, 139 }, { 125, 140 }, { 127, 141 }, { 128, 165 },
+       { 129, 143 }, { 130, 94 }, { 131, 145 }, { 133, 146 }, { 136, 147 },
+       { 140, 148 }, { 141, 115 }, { 142, 113 }, { 145, 130 }, { 148, 132 },
+       { 150, 87 }, { 151, 88 }, { 153, 89 }, { 155, 164 }, { 156, 129 },
+       { 157, 161 }, { 158, 120 }, { 161, 136 }, { 163, 142 }, { 172, 166 },
+       { 174, 167 },
+ };
+ 
  static const struct msm_pinctrl_soc_data sc7280_pinctrl = {
        .pins = sc7280_pins,
        .npins = ARRAY_SIZE(sc7280_pins),

diff --cc drivers/soc/tegra/pmc.c
Simple merge

diff --cc include/linux/firmware/xlnx-zynqmp.h
index 66e2423,8285a4b..9d1a5c1
--- 1/include/linux/firmware/xlnx-zynqmp.h
--- 2/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@@ -353,7 -403,20 +403,15 @@@ int zynqmp_pm_write_pggs(u32 index, u3
  int zynqmp_pm_read_pggs(u32 index, u32 *value);
  int zynqmp_pm_system_shutdown(const u32 type, const u32 subtype);
  int zynqmp_pm_set_boot_health_status(u32 value);
+ int zynqmp_pm_pinctrl_request(const u32 pin);
+ int zynqmp_pm_pinctrl_release(const u32 pin);
+ int zynqmp_pm_pinctrl_get_function(const u32 pin, u32 *id);
+ int zynqmp_pm_pinctrl_set_function(const u32 pin, const u32 id);
+ int zynqmp_pm_pinctrl_get_config(const u32 pin, const u32 param,
+                                u32 *value);
+ int zynqmp_pm_pinctrl_set_config(const u32 pin, const u32 param,
+                                u32 value);
  #else
 -static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void)
 -{
 -      return ERR_PTR(-ENODEV);
 -}
 -
  static inline int zynqmp_pm_get_api_version(u32 *version)
  {
        return -ENODEV;