diff options
author | Mark Brown <broonie@kernel.org> | 2016-03-21 14:17:43 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-03-22 06:30:12 -0400 |
commit | 895fe2321efaf62023fdd8239d1846394df68570 (patch) | |
tree | e6d70ca5c31cfeed2fcb6ae1308ad56ea7f45640 | |
parent | 768e66686cfe83f786f6ae26f1799cca69e80523 (diff) |
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>
-rw-r--r-- | drivers/regulator/of_regulator.c | 6 |
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, | |||
43 | constraints->max_uV = pval; | 43 | constraints->max_uV = pval; |
44 | 44 | ||
45 | /* Voltage change possible? */ | 45 | /* Voltage change possible? */ |
46 | if (constraints->min_uV != constraints->max_uV) | 46 | if (constraints->min_uV != constraints->max_uV) { |
47 | constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE; | 47 | constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE; |
48 | /* Only one voltage? Then make sure it's set. */ | ||
49 | if (constraints->min_uV && constraints->max_uV && | ||
50 | constraints->min_uV == constraints->max_uV) | ||
51 | constraints->apply_uV = true; | 48 | constraints->apply_uV = true; |
49 | } | ||
52 | 50 | ||
53 | if (!of_property_read_u32(np, "regulator-microvolt-offset", &pval)) | 51 | if (!of_property_read_u32(np, "regulator-microvolt-offset", &pval)) |
54 | constraints->uV_offset = pval; | 52 | constraints->uV_offset = pval; |