]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
gpiolib: of: Move Atmel HSMCI quirk up out of the regulator comment
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 2 Apr 2025 12:20:01 +0000 (15:20 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 May 2025 05:50:59 +0000 (07:50 +0200)
[ Upstream commit b8c7a1ac884cc267d1031f8de07f1a689a69fbab ]

The regulator comment in of_gpio_set_polarity_by_property()
made on top of a couple of the cases, while Atmel HSMCI quirk
is not related to that. Make it clear by moving Atmel HSMCI
quirk up out of the scope of the regulator comment.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20250402122058.1517393-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpio/gpiolib-of.c

index cec9e8f29bbdfee529cd3ad988a6f6c11ebaae5b..a0a2a0f75bba46afd76f49968a5799433139ac1d 100644 (file)
@@ -247,6 +247,9 @@ static void of_gpio_set_polarity_by_property(const struct device_node *np,
                { "fsl,imx8qm-fec",  "phy-reset-gpios", "phy-reset-active-high" },
                { "fsl,s32v234-fec", "phy-reset-gpios", "phy-reset-active-high" },
 #endif
+#if IS_ENABLED(CONFIG_MMC_ATMELMCI)
+               { "atmel,hsmci",       "cd-gpios",     "cd-inverted" },
+#endif
 #if IS_ENABLED(CONFIG_PCI_IMX6)
                { "fsl,imx6q-pcie",  "reset-gpio", "reset-gpio-active-high" },
                { "fsl,imx6sx-pcie", "reset-gpio", "reset-gpio-active-high" },
@@ -272,9 +275,6 @@ static void of_gpio_set_polarity_by_property(const struct device_node *np,
 #if IS_ENABLED(CONFIG_REGULATOR_GPIO)
                { "regulator-gpio",    "enable-gpio",  "enable-active-high" },
                { "regulator-gpio",    "enable-gpios", "enable-active-high" },
-#endif
-#if IS_ENABLED(CONFIG_MMC_ATMELMCI)
-               { "atmel,hsmci",       "cd-gpios",     "cd-inverted" },
 #endif
        };
        unsigned int i;