diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2019-10-30 10:48:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-04 09:06:12 +0100 |
| commit | 660041ba309268c3f5404da4ae1b7eba201f4c4c (patch) | |
| tree | d4d14626a93e702122715734cf77f7fb14c7fe8d /drivers/of/of_gpio.c | |
| parent | 8d6da6462b12a5e7cc84253ada8f91cd4561dc5e (diff) | |
| download | barebox-660041ba309268c3f5404da4ae1b7eba201f4c4c.tar.gz barebox-660041ba309268c3f5404da4ae1b7eba201f4c4c.tar.xz | |
OF: gpio: don't warn if ignored GPIO flag matches the behavior
Port of the upstream accepted change to the Linux kernel.
Some devicetrees specify the ACTIVE_LOW flag in the fixed regulator GPIO
handle. While this has always been ignored, it's consistent with the
behavior of the regulator binding in the absence of the
"enable-active-high" DT property. It doesn't make much sense to print a
user visible warning for a configuration which is consistent, so only
print the warning if the GPIO flag contradicts the behavior dictated by
by the enable-active-high property.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/of/of_gpio.c')
| -rw-r--r-- | drivers/of/of_gpio.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/of/of_gpio.c b/drivers/of/of_gpio.c index 9a8331ed18..7cbeeaf69e 100644 --- a/drivers/of/of_gpio.c +++ b/drivers/of/of_gpio.c @@ -19,18 +19,20 @@ static void of_gpio_flags_quirks(struct device_node *np, (!(strcmp(propname, "enable-gpio") && strcmp(propname, "enable-gpios")) && of_device_is_compatible(np, "regulator-gpio")))) { + bool active_low = !of_property_read_bool(np, + "enable-active-high"); /* * The regulator GPIO handles are specified such that the * presence or absence of "enable-active-high" solely controls * the polarity of the GPIO line. Any phandle flags must * be actively ignored. */ - if (*flags & OF_GPIO_ACTIVE_LOW) { + if ((*flags & OF_GPIO_ACTIVE_LOW) && !active_low) { pr_warn("%s GPIO handle specifies active low - ignored\n", np->full_name); *flags &= ~OF_GPIO_ACTIVE_LOW; } - if (!of_property_read_bool(np, "enable-active-high")) + if (active_low) *flags |= OF_GPIO_ACTIVE_LOW; } } |