]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
regulator: fixed: Modify enable-active-high behavior
authorPatrice Chotard <patrice.chotard@st.com>
Mon, 26 Aug 2019 11:50:31 +0000 (13:50 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 11 Oct 2019 14:10:19 +0000 (10:10 -0400)
Regulator should not be enabled at probe time if regulator-boot-on
property is not in the dt node.

"enable-active-high" property is only used to indicate the GPIO
polarity.

See kernel documentation :
 - Documentation/devicetree/bindings/regulator/fixed-regulator.yaml
 - Documentation/devicetree/bindings/regulator/gpio-regulator.yaml

Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
drivers/power/regulator/regulator_common.c

index 3dabbe2a85aff3c42a468f43dd27d9ba05551ee2..20410865672d9a78223f7d451282789132830a17 100644 (file)
@@ -12,10 +12,15 @@ int regulator_common_ofdata_to_platdata(struct udevice *dev,
        struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name)
 {
        struct gpio_desc *gpio;
+       struct dm_regulator_uclass_platdata *uc_pdata;
        int flags = GPIOD_IS_OUT;
        int ret;
 
-       if (dev_read_bool(dev, "enable-active-high"))
+       uc_pdata = dev_get_uclass_platdata(dev);
+
+       if (!dev_read_bool(dev, "enable-active-high"))
+               flags |= GPIOD_ACTIVE_LOW;
+       if (uc_pdata->boot_on)
                flags |= GPIOD_IS_OUT_ACTIVE;
 
        /* Get optional enable GPIO desc */