diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-20 01:19:26 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-20 01:19:26 +0400 |
| commit | 3c89963defdb9ecea862d9a10153d723289e91fc (patch) | |
| tree | 6c7507196afc25366c3127b204f198a4adc3cd37 /include/linux | |
| parent | 6217a69a1e38807b3046b4fd6e4bf413e0e03b67 (diff) | |
| parent | 15719ccc274981b19ad8fe9ac20c94249de8a257 (diff) | |
| download | linux-3c89963defdb9ecea862d9a10153d723289e91fc.tar.xz | |
Merge tag 'topic/fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into late/board
regulator: Fixed voltage regulator registration APIs
Some new convenience APIs for registering fixed voltage regulators.
* tag 'topic/fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: extend the fixed dummy voltage regulator to accept voltage
regulator: support multiple dummy fixed regulators
Dependency for renesas/board branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 |