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

Pull pin control updates from Linus Walleij:
 "We have no core changes but lots of incremental development in drivers
  all over the place: Renesas, NXP, Mediatek and Actions Semiconductor
  keep churning out new SoCs.

  I have some subtree maintainers for Renesas and Intel helping out to
  keep down the load, it's been working smoothly (Samsung also have a
  subtree but it was not used this cycle.)

  New drivers:

   - NXP (ex Freescale) i.MX 8 QXP SoC driver.

   - Mediatek MT6797 SoC driver.

   - Mediatek MT7629 SoC driver.

   - Actions Semiconductor S700 SoC driver.

   - Renesas RZ/A2 SoC driver.

   - Allwinner sunxi suniv F1C100 SoC driver.

   - Qualcomm PMS405 PMIC driver.

   - Microsemi Ocelot Jaguar2 SoC driver.

  Improvements:

   - Some RT improvements (using raw spinlocks where appropriate).

   - A lot of new pin sets on the Renesas PFC pin controllers.

   - GPIO hogs now work on the Qualcomm SPMI/SSBI pin controller GPIO
     chips, and Xway.

   - Major modernization of the Intel pin control drivers.

   - STM32 pin control driver will now synchronize usage of pins with
     another CPU using a hardware spinlock"

* tag 'pinctrl-v4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (145 commits)
  dt-bindings: arm: fsl-scu: add imx8qm pinctrl support
  pinctrl: freescale: Break dependency on SOC_IMX8MQ for i.MX8MQ
  pinctrl: imx-scu: Depend on IMX_SCU
  pinctrl: ocelot: Add dependency on HAS_IOMEM
  pinctrl: ocelot: add MSCC Jaguar2 support
  pinctrl: bcm: ns: support updated DT binding as syscon subnode
  dt-bindings: pinctrl: bcm4708-pinmux: rework binding to use syscon
  MAINTAINERS: merge at91 pinctrl entries
  pinctrl: imx8qxp: break the dependency on SOC_IMX8QXP
  pinctrl: uniphier: constify uniphier_pinctrl_socdata
  pinctrl: mediatek: improve Kconfig dependencies
  pinctrl: msm: mark PM functions as __maybe_unused
  dt-bindings: pinctrl: sunxi: Add supply properties
  pinctrl: meson: meson8b: add the missing GPIO_GROUPs for BOOT and CARD
  pinctrl: meson: meson8: add the missing GPIO_GROUPs for BOOT and CARD
  pinctrl: meson: meson8: rename the "gpio" function to "gpio_periphs"
  pinctrl: meson: meson8: rename the "gpio" function to "gpio_periphs"
  pinctrl: meson: meson8b: fix the GPIO function for the GPIOAO pins
  pinctrl: meson: meson8: fix the GPIO function for the GPIOAO pins
  pinctrl: sh-pfc: Make pinmux_cfg_reg.var_field_width[] variable-length
  ...

3 files changed, 71 insertions, 19 deletions

diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
index 158f618f1695..0c0a5018102b 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
@@ -239,13 +239,9 @@ static const unsigned int eth_link_led_pins[]	= { GPIOZ_14 };
 static const unsigned int eth_act_led_pins[]    = { GPIOZ_15 };
 
 static const unsigned int tsin_a_d0_pins[]      = { GPIODV_0 };
-static const unsigned int tsin_a_d0_x_pins[]    = { GPIOX_10 };
 static const unsigned int tsin_a_clk_pins[]     = { GPIODV_8 };
-static const unsigned int tsin_a_clk_x_pins[]   = { GPIOX_11 };
 static const unsigned int tsin_a_sop_pins[]     = { GPIODV_9 };
-static const unsigned int tsin_a_sop_x_pins[]   = { GPIOX_8 };
 static const unsigned int tsin_a_d_valid_pins[] = { GPIODV_10 };
-static const unsigned int tsin_a_d_valid_x_pins[] = { GPIOX_9 };
 static const unsigned int tsin_a_fail_pins[]    = { GPIODV_11 };
 static const unsigned int tsin_a_dp_pins[] = {
         GPIODV_1, GPIODV_2, GPIODV_3, GPIODV_4, GPIODV_5, GPIODV_6, GPIODV_7,
@@ -432,10 +428,6 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = {
         GROUP(spi_miso,         5,      2),
         GROUP(spi_ss0,          5,      1),
         GROUP(spi_sclk,         5,      0),
-        GROUP(tsin_a_sop_x,     6,      3),
-        GROUP(tsin_a_d_valid_x, 6,      2),
-        GROUP(tsin_a_d0_x,      6,      1),
-        GROUP(tsin_a_clk_x,     6,      0),
 
         /* Bank Z */
         GROUP(eth_mdio,         4,      23),
@@ -698,8 +690,8 @@ static const char * const eth_led_groups[] = {
 };
 
 static const char * const tsin_a_groups[] = {
-        "tsin_a_clk", "tsin_a_clk_x", "tsin_a_sop", "tsin_a_sop_x",
-        "tsin_a_d_valid", "tsin_a_d_valid_x", "tsin_a_d0", "tsin_a_d0_x",
+        "tsin_a_clk", "tsin_a_sop",
+        "tsin_a_d_valid", "tsin_a_d0",
         "tsin_a_dp", "tsin_a_fail",
 };
 
diff --git a/drivers/pinctrl/meson/pinctrl-meson8.c b/drivers/pinctrl/meson/pinctrl-meson8.c
index 86466173114d..785e29e74a56 100644
--- a/drivers/pinctrl/meson/pinctrl-meson8.c
+++ b/drivers/pinctrl/meson/pinctrl-meson8.c
@@ -506,6 +506,32 @@ static struct meson_pmx_group meson8_cbus_groups[] = {
         GPIO_GROUP(GPIOZ_12),
         GPIO_GROUP(GPIOZ_13),
         GPIO_GROUP(GPIOZ_14),
+        GPIO_GROUP(CARD_0),
+        GPIO_GROUP(CARD_1),
+        GPIO_GROUP(CARD_2),
+        GPIO_GROUP(CARD_3),
+        GPIO_GROUP(CARD_4),
+        GPIO_GROUP(CARD_5),
+        GPIO_GROUP(CARD_6),
+        GPIO_GROUP(BOOT_0),
+        GPIO_GROUP(BOOT_1),
+        GPIO_GROUP(BOOT_2),
+        GPIO_GROUP(BOOT_3),
+        GPIO_GROUP(BOOT_4),
+        GPIO_GROUP(BOOT_5),
+        GPIO_GROUP(BOOT_6),
+        GPIO_GROUP(BOOT_7),
+        GPIO_GROUP(BOOT_8),
+        GPIO_GROUP(BOOT_9),
+        GPIO_GROUP(BOOT_10),
+        GPIO_GROUP(BOOT_11),
+        GPIO_GROUP(BOOT_12),
+        GPIO_GROUP(BOOT_13),
+        GPIO_GROUP(BOOT_14),
+        GPIO_GROUP(BOOT_15),
+        GPIO_GROUP(BOOT_16),
+        GPIO_GROUP(BOOT_17),
+        GPIO_GROUP(BOOT_18),
 
         /* bank X */
         GROUP(sd_d0_a,          8,      5),
@@ -774,7 +800,7 @@ static struct meson_pmx_group meson8_aobus_groups[] = {
         GROUP(hdmi_cec_ao,              0,      17),
 };
 
-static const char * const gpio_groups[] = {
+static const char * const gpio_periphs_groups[] = {
         "GPIOX_0", "GPIOX_1", "GPIOX_2", "GPIOX_3", "GPIOX_4",
         "GPIOX_5", "GPIOX_6", "GPIOX_7", "GPIOX_8", "GPIOX_9",
         "GPIOX_10", "GPIOX_11", "GPIOX_12", "GPIOX_13", "GPIOX_14",
@@ -807,7 +833,9 @@ static const char * const gpio_groups[] = {
         "BOOT_5", "BOOT_6", "BOOT_7", "BOOT_8", "BOOT_9",
         "BOOT_10", "BOOT_11", "BOOT_12", "BOOT_13", "BOOT_14",
         "BOOT_15", "BOOT_16", "BOOT_17", "BOOT_18",
+};
 
+static const char * const gpio_aobus_groups[] = {
         "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3",
         "GPIOAO_4", "GPIOAO_5", "GPIOAO_6", "GPIOAO_7",
         "GPIOAO_8", "GPIOAO_9", "GPIOAO_10", "GPIOAO_11",
@@ -994,7 +1022,7 @@ static const char * const hdmi_cec_ao_groups[] = {
 };
 
 static struct meson_pmx_func meson8_cbus_functions[] = {
-        FUNCTION(gpio),
+        FUNCTION(gpio_periphs),
         FUNCTION(sd_a),
         FUNCTION(sdxc_a),
         FUNCTION(pcm_a),
@@ -1030,6 +1058,7 @@ static struct meson_pmx_func meson8_cbus_functions[] = {
 };
 
 static struct meson_pmx_func meson8_aobus_functions[] = {
+        FUNCTION(gpio_aobus),
         FUNCTION(uart_ao),
         FUNCTION(remote),
         FUNCTION(i2c_slave_ao),
diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c
index 647ad15d5c3c..c69ca95b1ad5 100644
--- a/drivers/pinctrl/meson/pinctrl-meson8b.c
+++ b/drivers/pinctrl/meson/pinctrl-meson8b.c
@@ -403,6 +403,34 @@ static struct meson_pmx_group meson8b_cbus_groups[] = {
         GPIO_GROUP(GPIOH_8),
         GPIO_GROUP(GPIOH_9),
 
+        GPIO_GROUP(CARD_0),
+        GPIO_GROUP(CARD_1),
+        GPIO_GROUP(CARD_2),
+        GPIO_GROUP(CARD_3),
+        GPIO_GROUP(CARD_4),
+        GPIO_GROUP(CARD_5),
+        GPIO_GROUP(CARD_6),
+
+        GPIO_GROUP(BOOT_0),
+        GPIO_GROUP(BOOT_1),
+        GPIO_GROUP(BOOT_2),
+        GPIO_GROUP(BOOT_3),
+        GPIO_GROUP(BOOT_4),
+        GPIO_GROUP(BOOT_5),
+        GPIO_GROUP(BOOT_6),
+        GPIO_GROUP(BOOT_7),
+        GPIO_GROUP(BOOT_8),
+        GPIO_GROUP(BOOT_9),
+        GPIO_GROUP(BOOT_10),
+        GPIO_GROUP(BOOT_11),
+        GPIO_GROUP(BOOT_12),
+        GPIO_GROUP(BOOT_13),
+        GPIO_GROUP(BOOT_14),
+        GPIO_GROUP(BOOT_15),
+        GPIO_GROUP(BOOT_16),
+        GPIO_GROUP(BOOT_17),
+        GPIO_GROUP(BOOT_18),
+
         GPIO_GROUP(DIF_0_P),
         GPIO_GROUP(DIF_0_N),
         GPIO_GROUP(DIF_1_P),
@@ -622,7 +650,7 @@ static struct meson_pmx_group meson8b_aobus_groups[] = {
         GROUP(i2s_lr_clk_in,    0,      14),
 };
 
-static const char * const gpio_groups[] = {
+static const char * const gpio_periphs_groups[] = {
         "GPIOX_0", "GPIOX_1", "GPIOX_2", "GPIOX_3", "GPIOX_4",
         "GPIOX_5", "GPIOX_6", "GPIOX_7", "GPIOX_8", "GPIOX_9",
         "GPIOX_10", "GPIOX_11", "GPIOX_16", "GPIOX_17", "GPIOX_18",
@@ -646,16 +674,18 @@ static const char * const gpio_groups[] = {
         "BOOT_10", "BOOT_11", "BOOT_12", "BOOT_13", "BOOT_14",
         "BOOT_15", "BOOT_16", "BOOT_17", "BOOT_18",
 
-        "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3",
-        "GPIOAO_4", "GPIOAO_5", "GPIOAO_6", "GPIOAO_7",
-        "GPIOAO_8", "GPIOAO_9", "GPIOAO_10", "GPIOAO_11",
-        "GPIOAO_12", "GPIOAO_13", "GPIO_BSD_EN", "GPIO_TEST_N",
-
         "DIF_0_P", "DIF_0_N", "DIF_1_P", "DIF_1_N",
         "DIF_2_P", "DIF_2_N", "DIF_3_P", "DIF_3_N",
         "DIF_4_P", "DIF_4_N"
 };
 
+static const char * const gpio_aobus_groups[] = {
+        "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3",
+        "GPIOAO_4", "GPIOAO_5", "GPIOAO_6", "GPIOAO_7",
+        "GPIOAO_8", "GPIOAO_9", "GPIOAO_10", "GPIOAO_11",
+        "GPIOAO_12", "GPIOAO_13", "GPIO_BSD_EN", "GPIO_TEST_N"
+};
+
 static const char * const sd_a_groups[] = {
         "sd_d0_a", "sd_d1_a", "sd_d2_a", "sd_d3_a", "sd_clk_a",
         "sd_cmd_a"
@@ -837,7 +867,7 @@ static const char * const tsin_b_groups[] = {
 };
 
 static struct meson_pmx_func meson8b_cbus_functions[] = {
-        FUNCTION(gpio),
+        FUNCTION(gpio_periphs),
         FUNCTION(sd_a),
         FUNCTION(sdxc_a),
         FUNCTION(pcm_a),
@@ -871,6 +901,7 @@ static struct meson_pmx_func meson8b_cbus_functions[] = {
 };
 
 static struct meson_pmx_func meson8b_aobus_functions[] = {
+        FUNCTION(gpio_aobus),
         FUNCTION(uart_ao),
         FUNCTION(uart_ao_b),
         FUNCTION(i2c_slave_ao),