diff mbox series

[1/2] regulator: core: Always flag voltage constraints as appliable

Message ID 1458587912-32665-1-git-send-email-broonie@kernel.org
State Accepted
Commit 895fe2321efaf62023fdd8239d1846394df68570
Headers show
Series [1/2] regulator: core: Always flag voltage constraints as appliable | expand

Commit Message

Mark Brown March 21, 2016, 7:18 p.m. UTC 
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>

---
 drivers/regulator/of_regulator.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

-- 
2.7.0
diff mbox series

Patch

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;