Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f288efd authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/dt' of... 

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

Documentation/power/regulator/regulator.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/regulator/fixed.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/regulator/of_regulator.c

+7 −3
Original line number Diff line number Diff line
@@ -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);

include/linux/regulator/of_regulator.h

+4 −2
Original line number Diff line number Diff line
@@ -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;

}