fixup! pinctrl: add a Cirrus ep93xx SoC pin controller

diff --git a/drivers/pinctrl/pinctrl-ep93xx.c b/drivers/pinctrl/pinctrl-ep93xx.c
index c16a3bc585a86a7890d79e58292e12dab862a621..7b92a241f8f7106ae04eb0d0c1549871e07c3506 100644 (file)
--- a/drivers/pinctrl/pinctrl-ep93xx.c
+++ b/drivers/pinctrl/pinctrl-ep93xx.c
@@ -1442,12 +1442,8 @@ static const char * const spigrps[] = { "ssp" };
 static const char * const ac97grps[] = { "ac97" };
 static const char * const i2sgrps[] = { "i2s_on_ssp", "i2s_on_ac97" };
 static const char * const pwm1grps[] = { "pwm1" };
-static const char * const gpio1grps[] = { "gpio1agrp" };
-static const char * const gpio2grps[] = { "gpio2agrp" };
-static const char * const gpio3grps[] = { "gpio3agrp" };
-static const char * const gpio4grps[] = { "gpio4agrp" };
-static const char * const gpio6grps[] = { "gpio6agrp" };
-static const char * const gpio7grps[] = { "gpio7agrp" };
+static const char * const gpiogrps[] = { "gpio1agrp", "gpio2agrp", "gpio3agrp",
+                                       "gpio4agrp", "gpio6agrp", "gpio7agrp" };
 static const char * const rastergrps[] = { "rasteronsdram0grp", "rasteronsdram3grp"};
 static const char * const keypadgrps[] = { "keypadgrp"};
 static const char * const idegrps[] = { "idegrp"};
@@ -1490,34 +1486,9 @@ static const struct ep93xx_pmx_func ep93xx_pmx_functions[] = {
                .num_groups = ARRAY_SIZE(rastergrps),
        },
        {
-               .name = "gpio1",
-               .groups = gpio1grps,
-               .num_groups = ARRAY_SIZE(gpio1grps),
-       },
-       {
-               .name = "gpio2",
-               .groups = gpio2grps,
-               .num_groups = ARRAY_SIZE(gpio2grps),
-       },
-       {
-               .name = "gpio3",
-               .groups = gpio3grps,
-               .num_groups = ARRAY_SIZE(gpio3grps),
-       },
-       {
-               .name = "gpio4",
-               .groups = gpio4grps,
-               .num_groups = ARRAY_SIZE(gpio4grps),
-       },
-       {
-               .name = "gpio6",
-               .groups = gpio6grps,
-               .num_groups = ARRAY_SIZE(gpio6grps),
-       },
-       {
-               .name = "gpio7",
-               .groups = gpio7grps,
-               .num_groups = ARRAY_SIZE(gpio7grps),
+               .name = "gpio",
+               .groups = gpiogrps,
+               .num_groups = ARRAY_SIZE(gpiogrps),
        },
 };