gpiolib: of: tighten selection of gpio renaming quirks

Tighten selection of legacy gpio renaming quirks so that they only
considered on more relevant configurations.

Suggested-by: Daniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 63c6fa3..7d4bbf6 100644 (file)
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -385,18 +385,21 @@ static struct gpio_desc *of_find_gpio_rename(struct device_node *np,
 #if IS_ENABLED(CONFIG_MFD_ARIZONA)
                { "wlf,reset",  NULL,           NULL },
 #endif
-#if IS_ENABLED(CONFIG_REGULATOR)
+
                /*
                 * Some regulator bindings happened before we managed to
                 * establish that GPIO properties should be named
                 * "foo-gpios" so we have this special kludge for them.
                 */
+#if IS_ENABLED(CONFIG_REGULATOR_ARIZONA_LDO1)
                { "wlf,ldoena",  NULL,          NULL }, /* Arizona */
+#endif
+#if IS_ENABLED(CONFIG_REGULATOR_WM8994)
                { "wlf,ldo1ena", NULL,          NULL }, /* WM8994 */
                { "wlf,ldo2ena", NULL,          NULL }, /* WM8994 */
 #endif
-#if IS_ENABLED(CONFIG_SPI_MASTER)
 
+#if IS_ENABLED(CONFIG_SPI_GPIO)
                /*
                 * The SPI GPIO bindings happened before we managed to
                 * establish that GPIO properties should be named
@@ -405,6 +408,7 @@ static struct gpio_desc *of_find_gpio_rename(struct device_node *np,
                { "miso",       "gpio-miso",    "spi-gpio" },
                { "mosi",       "gpio-mosi",    "spi-gpio" },
                { "sck",        "gpio-sck",     "spi-gpio" },
+#endif
 
                /*
                 * The old Freescale bindings use simply "gpios" as name
@@ -412,10 +416,14 @@ static struct gpio_desc *of_find_gpio_rename(struct device_node *np,
                 * all other SPI hardware. Allow this specifically for
                 * Freescale and PPC devices.
                 */
+#if IS_ENABLED(CONFIG_SPI_FSL_SPI)
                { "cs",         "gpios",        "fsl,spi" },
                { "cs",         "gpios",        "aeroflexgaisler,spictrl" },
+#endif
+#if IS_ENABLED(CONFIG_SPI_PPC4xx)
                { "cs",         "gpios",        "ibm,ppc4xx-spi" },
 #endif
+
 #if IS_ENABLED(CONFIG_TYPEC_FUSB302)
                /*
                 * Fairchild FUSB302 host is using undocumented "fcs,int_n"