summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-05 23:27:49 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-05 23:27:49 +0400
commit2f288efd2f9dd04e9a601364153d465fdd9a49bb (patch)
treef80da9df4079e98c0a83f511e353e98b36f82e53 /drivers/regulator
parent9a8f5e07200dd80fe5979490c36b62f64f70825b (diff)
parentd9a861cce10596ae1f10cffefe1ad4519a253475 (diff)
downloadlinux-2f288efd2f9dd04e9a601364153d465fdd9a49bb.tar.xz
Merge branch 'topic/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-next
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/fixed.c2
-rw-r--r--drivers/regulator/of_regulator.c10
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 72abbf5507a6..a44a017c0864 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -64,7 +64,7 @@ of_get_fixed_voltage_config(struct device *dev)
if (!config)
return NULL;
- config->init_data = of_get_regulator_init_data(dev);
+ config->init_data = of_get_regulator_init_data(dev, dev->of_node);
if (!config->init_data)
return NULL;
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index acd7045d1601..f1651eb69648 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -34,6 +34,9 @@ static void of_get_regulation_constraints(struct device_node *np,
/* Voltage change possible? */
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->apply_uV = true;
uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL);
if (uV_offset)
@@ -66,18 +69,19 @@ static void of_get_regulation_constraints(struct device_node *np,
* tree node, returns a pointer to the populated struture or NULL if memory
* alloc fails.
*/
-struct regulator_init_data *of_get_regulator_init_data(struct device *dev)
+struct regulator_init_data *of_get_regulator_init_data(struct device *dev,
+ struct device_node *node)
{
struct regulator_init_data *init_data;
- if (!dev->of_node)
+ if (!node)
return NULL;
init_data = devm_kzalloc(dev, sizeof(*init_data), GFP_KERNEL);
if (!init_data)
return NULL; /* Out of memory? */
- of_get_regulation_constraints(dev->of_node, &init_data);
+ of_get_regulation_constraints(node, &init_data);
return init_data;
}
EXPORT_SYMBOL_GPL(of_get_regulator_init_data);