regulator: Fixed voltage regulator registration APIs

Some new convenience APIs for registering fixed voltage regulators.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJP4ZwuAAoJEBus8iNuMP3d5F4P/3jcP7z3pEBZkG78PtgEv+6V
 Sq48Q7kRNXWB0P3dlPPbFCilZdROsfoU+cm0t/yhVWDU1DQ4ausGQl49v7D82GVU
 zDZ5XI9jGyHF6BDH3Soo5byMFjFTYsG/0CyPuTm/wfhgcgSVbxehgE7D/AsGLCzb
 P2GiP7M5TiHNxPDh0zRWX9TY/oFr6uF7QBDO93HRgxJ8dYCYy5k87/azUca+fTp1
 ibo9vrc5a8ZT12jlWE14ENqu6sA6BTLW6aD+QL1b5mSoh5eq3DHfO8FQir9jhtXO
 dciyHElViDsFVONaxWrOw5VNF9G12lj9jjo96JF/PmlmXrI4W+sbfaYWXuUDkVb+
 JSacXZFdoyYIqG/iAJdKTD5dXVMsf8xIcwJZ8duhYzROld04WFbSuzBbt1penHow
 Y1UiUg31H7YKgSO8TqtcQjt66eHvbw3uLuCS8JPtLdeF+jVORebzAxbctQGIFquL
 L9T/oyacKi6Gwx3QtuxwhgRARYKtQ37jOYyt9rFDY8eLSaj+g+apcHwDHOyd5BNz
 XJmydzh1VOHGGIZpJxe264J7zl4tX/SwlEP52jiLREPkenlv/YDv0NXFm8gI9NhX
 xqwRdlZsmsgcXhKeopM6yz7c6O0rHk+18YNcOF8xz/OMiNMnFzM8QvuHXTkKipai
 5K28c3zDdgoY2TKMjhod
 =Zl2U
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2012-07-19 23:19:26 +02:00
commit 3c89963def
2 changed files with 21 additions and 9 deletions

View File

@ -1,4 +1,5 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/platform_device.h>
#include <linux/regulator/machine.h>
#include <linux/regulator/fixed.h>
@ -13,17 +14,20 @@ 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
* @uv: voltage in microvolts
*/
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)
{
struct fixed_regulator_data *data;
@ -31,8 +35,13 @@ struct platform_device *regulator_register_fixed(int id,
if (!data)
return NULL;
data->cfg.supply_name = "fixed-dummy";
data->cfg.microvolts = 0;
data->cfg.supply_name = kstrdup(name, GFP_KERNEL);
if (!data->cfg.supply_name) {
kfree(data);
return NULL;
}
data->cfg.microvolts = uv;
data->cfg.gpio = -EINVAL;
data->cfg.enabled_at_boot = 1;
data->cfg.init_data = &data->init_data;

View File

@ -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