Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
This commit is contained in:
commit
6806a663b0
|
@ -51,7 +51,8 @@ struct fixed_voltage_data {
|
|||
* tree node, returns a pointer to the populated structure of NULL if memory
|
||||
* alloc fails.
|
||||
*/
|
||||
struct fixed_voltage_config *of_get_fixed_voltage_config(struct device *dev)
|
||||
static struct fixed_voltage_config *
|
||||
of_get_fixed_voltage_config(struct device *dev)
|
||||
{
|
||||
struct fixed_voltage_config *config;
|
||||
struct device_node *np = dev->of_node;
|
||||
|
@ -64,6 +65,9 @@ struct fixed_voltage_config *of_get_fixed_voltage_config(struct device *dev)
|
|||
return NULL;
|
||||
|
||||
config->init_data = of_get_regulator_init_data(dev);
|
||||
if (!config->init_data)
|
||||
return NULL;
|
||||
|
||||
init_data = config->init_data;
|
||||
|
||||
config->supply_name = init_data->constraints.name;
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
* (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
|
@ -79,3 +80,4 @@ struct regulator_init_data *of_get_regulator_init_data(struct device *dev)
|
|||
of_get_regulation_constraints(dev->of_node, &init_data);
|
||||
return init_data;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(of_get_regulator_init_data);
|
||||
|
|
Loading…
Reference in New Issue