Merge branch 'topic/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-next
commit
2f288efd2f
|
@ -12,7 +12,7 @@ Drivers can register a regulator by calling :-
|
||||||
|
|
||||||
struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
|
struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
|
||||||
struct device *dev, struct regulator_init_data *init_data,
|
struct device *dev, struct regulator_init_data *init_data,
|
||||||
void *driver_data);
|
void *driver_data, struct device_node *of_node);
|
||||||
|
|
||||||
This will register the regulators capabilities and operations to the regulator
|
This will register the regulators capabilities and operations to the regulator
|
||||||
core.
|
core.
|
||||||
|
|
|
@ -64,7 +64,7 @@ of_get_fixed_voltage_config(struct device *dev)
|
||||||
if (!config)
|
if (!config)
|
||||||
return NULL;
|
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)
|
if (!config->init_data)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
|
@ -34,6 +34,9 @@ static void of_get_regulation_constraints(struct device_node *np,
|
||||||
/* 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->apply_uV = true;
|
||||||
|
|
||||||
uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL);
|
uV_offset = of_get_property(np, "regulator-microvolt-offset", NULL);
|
||||||
if (uV_offset)
|
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
|
* tree node, returns a pointer to the populated struture or NULL if memory
|
||||||
* alloc fails.
|
* 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;
|
struct regulator_init_data *init_data;
|
||||||
|
|
||||||
if (!dev->of_node)
|
if (!node)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
init_data = devm_kzalloc(dev, sizeof(*init_data), GFP_KERNEL);
|
init_data = devm_kzalloc(dev, sizeof(*init_data), GFP_KERNEL);
|
||||||
if (!init_data)
|
if (!init_data)
|
||||||
return NULL; /* Out of memory? */
|
return NULL; /* Out of memory? */
|
||||||
|
|
||||||
of_get_regulation_constraints(dev->of_node, &init_data);
|
of_get_regulation_constraints(node, &init_data);
|
||||||
return init_data;
|
return init_data;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(of_get_regulator_init_data);
|
EXPORT_SYMBOL_GPL(of_get_regulator_init_data);
|
||||||
|
|
|
@ -8,10 +8,12 @@
|
||||||
|
|
||||||
#if defined(CONFIG_OF)
|
#if defined(CONFIG_OF)
|
||||||
extern struct regulator_init_data
|
extern struct regulator_init_data
|
||||||
*of_get_regulator_init_data(struct device *dev);
|
*of_get_regulator_init_data(struct device *dev,
|
||||||
|
struct device_node *node);
|
||||||
#else
|
#else
|
||||||
static inline struct regulator_init_data
|
static inline struct regulator_init_data
|
||||||
*of_get_regulator_init_data(struct device *dev)
|
*of_get_regulator_init_data(struct device *dev,
|
||||||
|
struct device_node *node)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue