Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / regulator / of_regulator.c

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 7827384..ea4f36f 100644 (file)
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -23,6 +23,8 @@ static void of_get_regulation_constraints(struct device_node *np,
        const __be32 *min_uA, *max_uA, *ramp_delay;
        struct property *prop;
        struct regulation_constraints *constraints = &(*init_data)->constraints;
+       int ret;
+       u32 pval;
 
        constraints->name = of_get_property(np, "regulator-name", NULL);
 
@@ -73,6 +75,10 @@ static void of_get_regulation_constraints(struct device_node *np,
                else
                        constraints->ramp_disable = true;
        }
+
+       ret = of_property_read_u32(np, "regulator-enable-ramp-delay", &pval);
+       if (!ret)
+               constraints->enable_time = pval;
 }
 
 /**