diff options
| author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2019-02-20 12:24:30 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-02-21 13:12:04 +0100 |
| commit | 21b4ab8f9e7100286c380a13e0e46ca6bf35e692 (patch) | |
| tree | b0a22e4ebf25a912046e6b6cdf9cb497abc610a8 /drivers | |
| parent | 692ef26e72fcce0c1e73c41683fd3512f3719d55 (diff) | |
| download | linux-21b4ab8f9e7100286c380a13e0e46ca6bf35e692.tar.bz2 | |
gpio: of: Handle both enable-gpio{,s}
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/gpiolib-of.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 950d3d6b2b7f..662c6f363ac2 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 |