Merge remote-tracking branches 'regulator/topic/mt6397', 'regulator/topic/of', 'regul...

[mirror_ubuntu-zesty-kernel.git] / drivers / regulator / of_regulator.c

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 92818979ed8fd839444602ee2001f618c1d642ba..6b0aa80b22fd1b4817c65995dfc1424fbb3d0c31 100644 (file)
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -92,6 +92,12 @@ static void of_get_regulation_constraints(struct device_node *np,
 
        constraints->soft_start = of_property_read_bool(np,
                                        "regulator-soft-start");
+       ret = of_property_read_u32(np, "regulator-active-discharge", &pval);
+       if (!ret) {
+               constraints->active_discharge =
+                               (pval) ? REGULATOR_ACTIVE_DISCHARGE_ENABLE :
+                                       REGULATOR_ACTIVE_DISCHARGE_DISABLE;
+       }
 
        if (!of_property_read_u32(np, "regulator-initial-mode", &pval)) {
                if (desc && desc->of_map_mode) {