From: Marek Vasut <marek.vasut+rene...@gmail.com>

Handle both enable-gpio and enable-gpios properties of the GPIO
regulator in the quirk. The later is the preferred modern name
of the property.

Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
Cc: Geert Uytterhoeven <geert+rene...@glider.be>
Cc: Jan Kotas <j...@cadence.com>
Cc: Linus Walleij <linus.wall...@linaro.org>
Cc: Mark Brown <broo...@kernel.org>
Cc: Thierry Reding <tred...@nvidia.com>
Cc: Wolfram Sang <wsa+rene...@sang-engineering.com>
Cc: linux-renesas-soc@vger.kernel.org
To: linux-g...@vger.kernel.org
---
 drivers/gpio/gpiolib-of.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index bddfc6102a50..8b9c3ab70f6e 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -87,7 +87,8 @@ static void of_gpio_flags_quirks(struct device_node *np,
            (of_device_is_compatible(np, "regulator-fixed") ||
             of_device_is_compatible(np, "reg-fixed-voltage") ||
             (of_device_is_compatible(np, "regulator-gpio") &&
-             strcmp(propname, "enable-gpio") == 0))) {
+             !(strcmp(propname, "enable-gpio") &&
+               strcmp(propname, "enable-gpios"))))) {
                /*
                 * The regulator GPIO handles are specified such that the
                 * presence or absence of "enable-active-high" solely controls
-- 
2.19.2

Reply via email to