ARM: pxa: Use REGULATOR_SUPPLY macro
Signed-off-by: Axel Lin <axel.lin@gmail.com> Cc: Eric Miao <eric.y.miao@gmail.com> Tested-by: Paul Parsons <lost.distance@yahoo.com> Acked-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
This commit is contained in:
parent
36be50515f
commit
0bf189abc5
|
@ -732,9 +732,7 @@ static inline void balloon3_nand_init(void) {}
|
||||||
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
||||||
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
||||||
static struct regulator_consumer_supply balloon3_max1587a_consumers[] = {
|
static struct regulator_consumer_supply balloon3_max1587a_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data balloon3_max1587a_v3_info = {
|
static struct regulator_init_data balloon3_max1587a_v3_info = {
|
||||||
|
|
|
@ -713,9 +713,7 @@ struct da9030_battery_info cm_x300_battery_info = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_consumer_supply buck2_consumers[] = {
|
static struct regulator_consumer_supply buck2_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data buck2_data = {
|
static struct regulator_init_data buck2_data = {
|
||||||
|
|
|
@ -1085,10 +1085,7 @@ static void __init em_x270_userspace_consumers_init(void)
|
||||||
/* DA9030 related initializations */
|
/* DA9030 related initializations */
|
||||||
#define REGULATOR_CONSUMER(_name, _dev_name, _supply) \
|
#define REGULATOR_CONSUMER(_name, _dev_name, _supply) \
|
||||||
static struct regulator_consumer_supply _name##_consumers[] = { \
|
static struct regulator_consumer_supply _name##_consumers[] = { \
|
||||||
{ \
|
REGULATOR_SUPPLY(_supply, _dev_name), \
|
||||||
.dev_name = _dev_name, \
|
|
||||||
.supply = _supply, \
|
|
||||||
}, \
|
|
||||||
}
|
}
|
||||||
|
|
||||||
REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps");
|
REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps");
|
||||||
|
|
|
@ -680,12 +680,8 @@ static struct platform_device power_supply = {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static struct regulator_consumer_supply bq24022_consumers[] = {
|
static struct regulator_consumer_supply bq24022_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vbus_draw", NULL),
|
||||||
.supply = "vbus_draw",
|
REGULATOR_SUPPLY("ac_draw", NULL),
|
||||||
},
|
|
||||||
{
|
|
||||||
.supply = "ac_draw",
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data bq24022_init_data = {
|
static struct regulator_init_data bq24022_init_data = {
|
||||||
|
@ -764,9 +760,8 @@ static struct platform_device strataflash = {
|
||||||
* Maxim MAX1587A on PI2C
|
* Maxim MAX1587A on PI2C
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static struct regulator_consumer_supply max1587a_consumer = {
|
static struct regulator_consumer_supply max1587a_consumer =
|
||||||
.supply = "vcc_core",
|
REGULATOR_SUPPLY("vcc_core", NULL);
|
||||||
};
|
|
||||||
|
|
||||||
static struct regulator_init_data max1587a_v3_info = {
|
static struct regulator_init_data max1587a_v3_info = {
|
||||||
.constraints = {
|
.constraints = {
|
||||||
|
|
|
@ -579,12 +579,8 @@ static struct platform_device power_supply = {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static struct regulator_consumer_supply bq24022_consumers[] = {
|
static struct regulator_consumer_supply bq24022_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vbus_draw", NULL),
|
||||||
.supply = "vbus_draw",
|
REGULATOR_SUPPLY("ac_draw", NULL),
|
||||||
},
|
|
||||||
{
|
|
||||||
.supply = "ac_draw",
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data bq24022_init_data = {
|
static struct regulator_init_data bq24022_init_data = {
|
||||||
|
|
|
@ -581,9 +581,7 @@ static struct wm97xx_pdata mioa701_wm97xx_pdata = {
|
||||||
* Voltage regulation
|
* Voltage regulation
|
||||||
*/
|
*/
|
||||||
static struct regulator_consumer_supply max1586_consumers[] = {
|
static struct regulator_consumer_supply max1586_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data max1586_v3_info = {
|
static struct regulator_init_data max1586_v3_info = {
|
||||||
|
|
|
@ -429,9 +429,7 @@ void __init palm27x_power_init(int ac, int usb)
|
||||||
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
||||||
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
||||||
static struct regulator_consumer_supply palm27x_max1587a_consumers[] = {
|
static struct regulator_consumer_supply palm27x_max1587a_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data palm27x_max1587a_v3_info = {
|
static struct regulator_init_data palm27x_max1587a_v3_info = {
|
||||||
|
|
|
@ -877,9 +877,7 @@ static struct i2c_board_info spitz_i2c_devs[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_consumer_supply isl6271a_consumers[] = {
|
static struct regulator_consumer_supply isl6271a_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data isl6271a_info[] = {
|
static struct regulator_init_data isl6271a_info[] = {
|
||||||
|
|
|
@ -151,10 +151,7 @@ static struct platform_device sht15 = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_consumer_supply stargate2_sensor_3_con[] = {
|
static struct regulator_consumer_supply stargate2_sensor_3_con[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc", "sht15"),
|
||||||
.dev_name = "sht15",
|
|
||||||
.supply = "vcc",
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum stargate2_ldos{
|
enum stargate2_ldos{
|
||||||
|
|
|
@ -640,9 +640,7 @@ static inline void vpac270_ide_init(void) {}
|
||||||
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
#if defined(CONFIG_REGULATOR_MAX1586) || \
|
||||||
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
defined(CONFIG_REGULATOR_MAX1586_MODULE)
|
||||||
static struct regulator_consumer_supply vpac270_max1587a_consumers[] = {
|
static struct regulator_consumer_supply vpac270_max1587a_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data vpac270_max1587a_v3_info = {
|
static struct regulator_init_data vpac270_max1587a_v3_info = {
|
||||||
|
|
|
@ -615,9 +615,7 @@ static inline void z2_spi_init(void) {}
|
||||||
#if defined(CONFIG_REGULATOR_TPS65023) || \
|
#if defined(CONFIG_REGULATOR_TPS65023) || \
|
||||||
defined(CONFIG_REGULATOR_TPS65023_MODULE)
|
defined(CONFIG_REGULATOR_TPS65023_MODULE)
|
||||||
static struct regulator_consumer_supply z2_tps65021_consumers[] = {
|
static struct regulator_consumer_supply z2_tps65021_consumers[] = {
|
||||||
{
|
REGULATOR_SUPPLY("vcc_core", NULL),
|
||||||
.supply = "vcc_core",
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct regulator_init_data z2_tps65021_info[] = {
|
static struct regulator_init_data z2_tps65021_info[] = {
|
||||||
|
|
Loading…
Reference in New Issue