Commit b527a233 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

This fixes an integration issue with the regulator device tree bindings
which shook out in -rc.  The bindings were overly enthusiatic when
deciding to set a voltage on a regulator and would try to set zero volts
on an unconfigured regulator which isn't supported.

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Set apply_uV only when min and max voltages are defined
parents 883120eb 8a093049
...@@ -35,7 +35,7 @@ static void of_get_regulation_constraints(struct device_node *np, ...@@ -35,7 +35,7 @@ static void of_get_regulation_constraints(struct device_node *np,
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. */ /* Only one voltage? Then make sure it's set. */
if (constraints->min_uV == constraints->max_uV) if (min_uV && max_uV && constraints->min_uV == constraints->max_uV)
constraints->apply_uV = true; constraints->apply_uV = true;
uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL); uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment