diff options
Diffstat (limited to 'drivers/regulator/of_regulator.c')
| -rw-r--r-- | drivers/regulator/of_regulator.c | 10 |
1 files changed, 7 insertions, 3 deletions
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); |