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

Commit dfad84ae authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mark Brown
Browse files

regulator: support multiple dummy fixed regulators 



Currently regulator_register_fixed() uses a constant name to register a
fixed dummy regulator. This is sufficient in principle, since there is no
reason to register multiple such regulators. The user can simply supply all
consumers in one array and use it to initialise such a regulator. However,
in some cases it can be convenient to register multiple such regulators.
This is also a prerequisite for the upcoming patch, that will add a voltage
parameter to this function. The original function is provided as a wrapper
macro.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 485802a6

drivers/regulator/fixed-helper.c

+11 −3
Original line number Diff line number Diff line 
#include <linux/slab.h>

#include <linux/string.h>

#include <linux/platform_device.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/fixed.h>
@@ -13,16 +14,18 @@ static void regulator_fixed_release(struct device *dev) 
{

	struct fixed_regulator_data *data = container_of(dev,

			struct fixed_regulator_data, pdev.dev);

	kfree(data->cfg.supply_name);

	kfree(data);

}



/**

 * regulator_register_fixed - register a no-op fixed regulator

 * regulator_register_fixed_name - register a no-op fixed regulator

 * @id: platform device id

 * @name: name to be used for the regulator

 * @supplies: consumers for this regulator

 * @num_supplies: number of consumers

 */

struct platform_device *regulator_register_fixed(int id,

struct platform_device *regulator_register_always_on(int id, const char *name,

		struct regulator_consumer_supply *supplies, int num_supplies)

{

	struct fixed_regulator_data *data;
@@ -31,7 +34,12 @@ struct platform_device *regulator_register_fixed(int id, 
	if (!data)

		return NULL;



	data->cfg.supply_name = "fixed-dummy";

	data->cfg.supply_name = kstrdup(name, GFP_KERNEL);

	if (!data->cfg.supply_name) {

		kfree(data);

		return NULL;

	}



	data->cfg.microvolts = 0;

	data->cfg.gpio = -EINVAL;

	data->cfg.enabled_at_boot = 1;

include/linux/regulator/fixed.h

+5 −2
Original line number Diff line number Diff line
@@ -58,14 +58,17 @@ struct fixed_voltage_config { 
struct regulator_consumer_supply;



#if IS_ENABLED(CONFIG_REGULATOR)

struct platform_device *regulator_register_fixed(int id,

struct platform_device *regulator_register_always_on(int id, const char *name,

		struct regulator_consumer_supply *supplies, int num_supplies);

#else

static inline struct platform_device *regulator_register_fixed(int id,

static inline struct platform_device *regulator_register_always_on(int id, const char *name,

		struct regulator_consumer_supply *supplies, int num_supplies)

{

	return NULL;

}

#endif



#define regulator_register_fixed(id, s, ns) regulator_register_always_on(id, \

						"fixed-dummy", s, ns)



#endif