Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bf189ab authored by Axel Lin's avatar Axel Lin Committed by Haojian Zhuang
Browse files

ARM: pxa: Use REGULATOR_SUPPLY macro 



Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Tested-by: default avatarPaul Parsons <lost.distance@yahoo.com>
Acked-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@gmail.com>
parent 36be5051

arch/arm/mach-pxa/balloon3.c

+1 −3
Original line number Diff line number Diff line
@@ -732,9 +732,7 @@ static inline void balloon3_nand_init(void) {} 
#if defined(CONFIG_REGULATOR_MAX1586) || \

    defined(CONFIG_REGULATOR_MAX1586_MODULE)

static struct regulator_consumer_supply balloon3_max1587a_consumers[] = {

	{

		.supply	= "vcc_core",

	}

	REGULATOR_SUPPLY("vcc_core", NULL),

};



static struct regulator_init_data balloon3_max1587a_v3_info = {

arch/arm/mach-pxa/cm-x300.c

+1 −3
Original line number Diff line number Diff line
@@ -713,9 +713,7 @@ struct da9030_battery_info cm_x300_battery_info = { 
};



static struct regulator_consumer_supply buck2_consumers[] = {

	{

		.supply = "vcc_core",

	},

	REGULATOR_SUPPLY("vcc_core", NULL),

};



static struct regulator_init_data buck2_data = {

arch/arm/mach-pxa/em-x270.c

+1 −4
Original line number Diff line number Diff line
@@ -1085,10 +1085,7 @@ static void __init em_x270_userspace_consumers_init(void) 
/* DA9030 related initializations */

#define REGULATOR_CONSUMER(_name, _dev_name, _supply)		        \

	static struct regulator_consumer_supply _name##_consumers[] = {	\

		{							\

			.dev_name = _dev_name,				\

			.supply = _supply,				\

		},							\

		REGULATOR_SUPPLY(_supply, _dev_name),			\

	}



REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps");

arch/arm/mach-pxa/hx4700.c

+4 −9
Original line number Diff line number Diff line
@@ -680,12 +680,8 @@ static struct platform_device power_supply = { 
 */



static struct regulator_consumer_supply bq24022_consumers[] = {

	{

		.supply = "vbus_draw",

	},

	{

		.supply = "ac_draw",

	},

	REGULATOR_SUPPLY("vbus_draw", NULL),

	REGULATOR_SUPPLY("ac_draw", NULL),

};



static struct regulator_init_data bq24022_init_data = {
@@ -764,9 +760,8 @@ static struct platform_device strataflash = { 
 * Maxim MAX1587A on PI2C

 */



static struct regulator_consumer_supply max1587a_consumer = {

	.supply = "vcc_core",

};

static struct regulator_consumer_supply max1587a_consumer =

	REGULATOR_SUPPLY("vcc_core", NULL);



static struct regulator_init_data max1587a_v3_info = {

	.constraints = {

arch/arm/mach-pxa/magician.c

+2 −6
Original line number Diff line number Diff line
@@ -579,12 +579,8 @@ static struct platform_device power_supply = { 
 */



static struct regulator_consumer_supply bq24022_consumers[] = {

	{

		.supply = "vbus_draw",

	},

	{

		.supply = "ac_draw",

	},

	REGULATOR_SUPPLY("vbus_draw", NULL),

	REGULATOR_SUPPLY("ac_draw", NULL),

};



static struct regulator_init_data bq24022_init_data = {