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

[sfrench/cifs-2.6.git] / drivers / pinctrl / meson / pinctrl-meson8b.c

diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c
index 647ad15d5c3c41ee538688ade979145efa459b9b..c69ca95b1ad571368c89ccb8146aaa5b83a7c343 100644 (file)
--- 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),