Skip to content

Commit

Permalink
regulator: extend the fixed dummy voltage regulator to accept voltage
Browse files Browse the repository at this point in the history
Trivially extend the regulator_register_always_on() helper function to be
even more useful by adding a voltage parameter to it.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Guennadi Liakhovetski authored and Mark Brown committed Jun 19, 2012
1 parent dfad84a commit 15719cc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions drivers/regulator/fixed-helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ static void regulator_fixed_release(struct device *dev)
* @name: name to be used for the regulator
* @supplies: consumers for this regulator
* @num_supplies: number of consumers
* @uv: voltage in microvolts
*/
struct platform_device *regulator_register_always_on(int id, const char *name,
struct regulator_consumer_supply *supplies, int num_supplies)
struct regulator_consumer_supply *supplies, int num_supplies, int uv)
{
struct fixed_regulator_data *data;

Expand All @@ -40,7 +41,7 @@ struct platform_device *regulator_register_always_on(int id, const char *name,
return NULL;
}

data->cfg.microvolts = 0;
data->cfg.microvolts = uv;
data->cfg.gpio = -EINVAL;
data->cfg.enabled_at_boot = 1;
data->cfg.init_data = &data->init_data;
Expand Down
6 changes: 3 additions & 3 deletions include/linux/regulator/fixed.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ struct regulator_consumer_supply;

#if IS_ENABLED(CONFIG_REGULATOR)
struct platform_device *regulator_register_always_on(int id, const char *name,
struct regulator_consumer_supply *supplies, int num_supplies);
struct regulator_consumer_supply *supplies, int num_supplies, int uv);
#else
static inline struct platform_device *regulator_register_always_on(int id, const char *name,
struct regulator_consumer_supply *supplies, int num_supplies)
struct regulator_consumer_supply *supplies, int num_supplies, int uv)
{
return NULL;
}
#endif

#define regulator_register_fixed(id, s, ns) regulator_register_always_on(id, \
"fixed-dummy", s, ns)
"fixed-dummy", s, ns, 0)

#endif

0 comments on commit 15719cc

Please sign in to comment.