Message ID | 20190220112430.13550-1-marek.vasut@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Geert Uytterhoeven |
Headers | show |
Series | gpio: of: Handle both enable-gpio{,s} | expand |
On Wed, Feb 20, 2019 at 12:24 PM <marek.vasut@gmail.com> wrote: > From: Marek Vasut <marek.vasut+renesas@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+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 This patch applied on top of Thierry's patch (which worked fine so I guess this order was implied). Yours, Linus Walleij
On 2/21/19 1:13 PM, Linus Walleij wrote: > On Wed, Feb 20, 2019 at 12:24 PM <marek.vasut@gmail.com> wrote: > >> From: Marek Vasut <marek.vasut+renesas@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+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 > > This patch applied on top of Thierry's patch (which worked fine > so I guess this order was implied). Jupp, thanks!
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