aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@sonymobile.com>2015-08-18 18:14:06 -0400
committerMark Brown <broonie@kernel.org>2015-09-17 07:14:12 -0400
commitb263d20373d7726dd3ac0cd5e32f123e69a02847 (patch)
tree03fb36f2615a14c30a504419f8083a4d1e75dd06
parent6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff)
regulator: Introduce property to flag set-load support
Introduce "regulator-allow-set-load" property to make it possible to flag in the board configuration that a regulator is allowed to have the load requirements changed. Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--Documentation/devicetree/bindings/regulator/regulator.txt1
-rw-r--r--drivers/regulator/of_regulator.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt
index 24bd422cecd5..1d112fc456aa 100644
--- a/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@ -11,6 +11,7 @@ Optional properties:
11- regulator-always-on: boolean, regulator should never be disabled 11- regulator-always-on: boolean, regulator should never be disabled
12- regulator-boot-on: bootloader/firmware enabled regulator 12- regulator-boot-on: bootloader/firmware enabled regulator
13- regulator-allow-bypass: allow the regulator to go into bypass mode 13- regulator-allow-bypass: allow the regulator to go into bypass mode
14- regulator-allow-set-load: allow the regulator performance level to be configured
14- <name>-supply: phandle to the parent supply/regulator node 15- <name>-supply: phandle to the parent supply/regulator node
15- regulator-ramp-delay: ramp delay for regulator(in uV/uS) 16- regulator-ramp-delay: ramp delay for regulator(in uV/uS)
16 For hardware which supports disabling ramp rate, it should be explicitly 17 For hardware which supports disabling ramp rate, it should be explicitly
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 250700c853bf..499e437c7e91 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -76,6 +76,9 @@ static void of_get_regulation_constraints(struct device_node *np,
76 if (of_property_read_bool(np, "regulator-allow-bypass")) 76 if (of_property_read_bool(np, "regulator-allow-bypass"))
77 constraints->valid_ops_mask |= REGULATOR_CHANGE_BYPASS; 77 constraints->valid_ops_mask |= REGULATOR_CHANGE_BYPASS;
78 78
79 if (of_property_read_bool(np, "regulator-allow-set-load"))
80 constraints->valid_ops_mask |= REGULATOR_CHANGE_DRMS;
81
79 ret = of_property_read_u32(np, "regulator-ramp-delay", &pval); 82 ret = of_property_read_u32(np, "regulator-ramp-delay", &pval);
80 if (!ret) { 83 if (!ret) {
81 if (pval) 84 if (pval)