summaryrefslogtreecommitdiff
path: root/drivers/regulator/of_regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-03-21 21:17:43 +0300
committerMark Brown <broonie@kernel.org>2016-03-22 13:30:12 +0300
commit895fe2321efaf62023fdd8239d1846394df68570 (patch)
treee6d70ca5c31cfeed2fcb6ae1308ad56ea7f45640 /drivers/regulator/of_regulator.c
parent768e66686cfe83f786f6ae26f1799cca69e80523 (diff)
downloadlinux-895fe2321efaf62023fdd8239d1846394df68570.tar.xz
regulator: core: Always flag voltage constraints as appliable
Allow the core to always use the voltage constraints to set the voltage on startup. A forthcoming change in that code will ensure that we bring out of constraints voltages into spec with this setting. Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/of_regulator.c')
-rw-r--r--drivers/regulator/of_regulator.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 6b0aa80b22fd..d2ddefaaddaf 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -43,12 +43,10 @@ static void of_get_regulation_constraints(struct device_node *np,
constraints->max_uV = pval;
/* Voltage change possible? */
- if (constraints->min_uV != constraints->max_uV)
+ if (constraints->min_uV != constraints->max_uV) {
constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE;
- /* Only one voltage? Then make sure it's set. */
- if (constraints->min_uV && constraints->max_uV &&
- constraints->min_uV == constraints->max_uV)
constraints->apply_uV = true;
+ }
if (!of_property_read_u32(np, "regulator-microvolt-offset", &pval))
constraints->uV_offset = pval;