Browse Source

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>
Mark Brown 9 years ago
parent
commit
895fe2321e
1 changed files with 2 additions and 4 deletions
  1. 2 4
      drivers/regulator/of_regulator.c

+ 2 - 4
drivers/regulator/of_regulator.c

@@ -43,12 +43,10 @@ static void of_get_regulation_constraints(struct device_node *np,
 		constraints->max_uV = pval;
 		constraints->max_uV = pval;
 
 
 	/* Voltage change possible? */
 	/* Voltage change possible? */
-	if (constraints->min_uV != constraints->max_uV)
+	if (constraints->min_uV != constraints->max_uV) {
 		constraints->valid_ops_mask |= REGULATOR_CHANGE_VOLTAGE;
 		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;
 		constraints->apply_uV = true;
+	}
 
 
 	if (!of_property_read_u32(np, "regulator-microvolt-offset", &pval))
 	if (!of_property_read_u32(np, "regulator-microvolt-offset", &pval))
 		constraints->uV_offset = pval;
 		constraints->uV_offset = pval;