pinctrl: meson-gx: fix GPIO_TEST_N and GPIOCLK_ groups

The GPIO_TEST_N was in the wrong pmx group table, move it back with the AO
groups, GPIODV_18 was missing, add it back, and finally the GPIOCLK_*
group names were missing.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
index 22e8b055d79f628cf6d18f82a16314e3a2c42804..59b5be6211f9aad28fac429dd1d162eee1834f45 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
@@ -144,6 +144,7 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = {
        GPIO_GROUP(GPIODV_15, EE_OFF),
        GPIO_GROUP(GPIODV_16, EE_OFF),
        GPIO_GROUP(GPIODV_17, EE_OFF),
+       GPIO_GROUP(GPIODV_18, EE_OFF),
        GPIO_GROUP(GPIODV_19, EE_OFF),
        GPIO_GROUP(GPIODV_20, EE_OFF),
        GPIO_GROUP(GPIODV_21, EE_OFF),
@@ -203,8 +204,6 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = {
        GPIO_GROUP(GPIOCLK_2, EE_OFF),
        GPIO_GROUP(GPIOCLK_3, EE_OFF),
 
-       GPIO_GROUP(GPIO_TEST_N, EE_OFF),
-
        /* Bank X */
        GROUP(uart_tx_a,        4,      13),
        GROUP(uart_rx_a,        4,      12),
@@ -270,6 +269,8 @@ static struct meson_pmx_group meson_gxbb_aobus_groups[] = {
        GPIO_GROUP(GPIOAO_12, 0),
        GPIO_GROUP(GPIOAO_13, 0),
 
+       GPIO_GROUP(GPIO_TEST_N, 0),
+
        /* bank AO */
        GROUP(uart_tx_ao_b,     0,      26),
        GROUP(uart_rx_ao_b,     0,      25),
@@ -318,6 +319,8 @@ static const char * const gpio_periphs_groups[] = {
        "GPIOX_10", "GPIOX_11", "GPIOX_12", "GPIOX_13", "GPIOX_14",
        "GPIOX_15", "GPIOX_16", "GPIOX_17", "GPIOX_18", "GPIOX_19",
        "GPIOX_20", "GPIOX_21", "GPIOX_22",
+
+       "GPIOCLK_0", "GPIOCLK_1", "GPIOCLK_2", "GPIOCLK_3",
 };
 
 static const char * const emmc_groups[] = {

diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
index 1819eee4d075680fccc6c3580a1ef0f69ec55448..5acc21b9c2e695eca5ccb1f4a03c11d39dc50648 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
@@ -254,6 +254,7 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = {
        GPIO_GROUP(GPIODV_15, EE_OFF),
        GPIO_GROUP(GPIODV_16, EE_OFF),
        GPIO_GROUP(GPIODV_17, EE_OFF),
+       GPIO_GROUP(GPIODV_18, EE_OFF),
        GPIO_GROUP(GPIODV_19, EE_OFF),
        GPIO_GROUP(GPIODV_20, EE_OFF),
        GPIO_GROUP(GPIODV_21, EE_OFF),
@@ -289,8 +290,6 @@ static struct meson_pmx_group meson_gxl_periphs_groups[] = {
        GPIO_GROUP(GPIOCLK_0, EE_OFF),
        GPIO_GROUP(GPIOCLK_1, EE_OFF),
 
-       GPIO_GROUP(GPIO_TEST_N, 0),
-
        /* Bank X */
        GROUP(sdio_d0,          5,      31),
        GROUP(sdio_d1,          5,      30),
@@ -415,6 +414,8 @@ static struct meson_pmx_group meson_gxl_aobus_groups[] = {
        GPIO_GROUP(GPIOAO_8, 0),
        GPIO_GROUP(GPIOAO_9, 0),
 
+       GPIO_GROUP(GPIO_TEST_N, 0),
+
        /* bank AO */
        GROUP(uart_tx_ao_b_0,   0,      26),
        GROUP(uart_rx_ao_b_1,   0,      25),
@@ -471,6 +472,7 @@ static const char * const gpio_periphs_groups[] = {
        "GPIOX_5", "GPIOX_6", "GPIOX_7", "GPIOX_8", "GPIOX_9",
        "GPIOX_10", "GPIOX_11", "GPIOX_12", "GPIOX_13", "GPIOX_14",
        "GPIOX_15", "GPIOX_16", "GPIOX_17", "GPIOX_18",
+       "GPIOCLK_0", "GPIOCLK_1",
 };
 
 static const char * const emmc_groups[] = {