OSDN Git Service

gpio: of: Handle both enable-gpio{,s}
authorMarek Vasut <marek.vasut+renesas@gmail.com>
Wed, 20 Feb 2019 11:24:30 +0000 (12:24 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 21 Feb 2019 12:12:04 +0000 (13:12 +0100)
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+renesas@gmail.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Jan Kotas <jank@cadence.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: linux-renesas-soc@vger.kernel.org
To: linux-gpio@vger.kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpiolib-of.c

index 950d3d6..662c6f3 100644 (file)
@@ -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