From: Mark Brown <broonie@kernel.org>
Date: Mon, 21 Mar 2016 18:17:43 +0000 (+0000)
Subject: UPSTREAM: regulator: core: Always flag voltage constraints as appliable
X-Git-Tag: firefly_0821_release~475
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6d2f9cccaa7f139a6d1fe44db4a3b8ff6f792ee9;p=firefly-linux-kernel-4.4.55.git

UPSTREAM: 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>
(cherry picked from commit 895fe2321efaf62023fdd8239d1846394df68570)

Change-Id: I62f44ce1d8a2649a855ef93d9ec551b78ee4b40b
Signed-off-by: David Wu <david.wu@rock-chips.com>
---

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;