renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 10:13:57 +08:00
Code

Merge branch 'topic/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-next

Browse Source
This commit is contained in:
Mark Brown 2011-12-05 19:27:49 +00:00
commit 2f288efd2f
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/power/regulator/regulator.txt
View File

@ -12,7 +12,7 @@ Drivers can register a regulator by calling :-
struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
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
core.

2
drivers/regulator/fixed.c
View File

@ -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;

10
drivers/regulator/of_regulator.c
View File

@ -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);

6
include/linux/regulator/of_regulator.h
View File

@ -8,10 +8,12 @@
#if defined(CONFIG_OF)
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
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;
}