diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-06-30 22:42:11 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-06-30 22:42:11 +0200 |
| commit | 8c8fb1361af8e2fce94edf2a49f97a4469ae1aeb (patch) | |
| tree | 6c73354964739b2d174bcd215532e8b6f8540b10 /include/linux | |
| parent | a01366b4b5cc669633d1cf6ee327c85a5406ef5f (diff) | |
| parent | 21503a86db5015b74cceb54c41ed8862107ddaec (diff) | |
Merge branch 'renesas-board-common' into renesas-armadillo
* renesas-board-common:
regulator: extend the fixed dummy voltage regulator to accept voltage
regulator: support multiple dummy fixed regulators
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regulator/fixed.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h index f83f7440b488..680f24e08af2 100644 --- a/include/linux/regulator/fixed.h +++ b/include/linux/regulator/fixed.h @@ -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 regulator_consumer_supply *supplies, int num_supplies); +struct platform_device *regulator_register_always_on(int id, const char *name, + struct regulator_consumer_supply *supplies, int num_supplies, int uv); #else -static inline struct platform_device *regulator_register_fixed(int id, - struct regulator_consumer_supply *supplies, int num_supplies) +static inline struct platform_device *regulator_register_always_on(int id, const char *name, + 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, 0) + #endif |