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 6b0aa80b22fd1b4817c65995dfc1424fbb3d0c31..d2ddefaaddaff5941e1c32ee6e1e9b1df4b5686a 100644 (file)
--- 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;