regulator: pass device_node to of_get_regulator_init_data()
It's not always true that the device_node of regulator can be found at dev->of_node at the time when of_get_regulator_init_data() is being called, because in some cases the regulator nodes in device tree do not have 'struct device' behind them until regulator_dev gets created for it by core function regulator_register(). The patch adds device_node as a new parameter to of_get_regulator_init_data(), so that caller can pass in the node of regulator directly. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
ab62aa931e
commit
d9a861cce1
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -69,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