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

Commit d3f9c570 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: S5PV210: Use REGULATOR_SUPPLY macro for regulator consumers 



To use REGULATOR_SUPPLY macro is cleaner for initializing regulator
consumer supply.

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent f5412be5

arch/arm/mach-s5pv210/mach-aquila.c

+17 −35
Original line number Diff line number Diff line
@@ -296,13 +296,11 @@ static struct regulator_init_data aquila_ldo17_data = { 
};



/* BUCK */

static struct regulator_consumer_supply buck1_consumer[] = {

	{	.supply	= "vddarm", },

};

static struct regulator_consumer_supply buck1_consumer =

	REGULATOR_SUPPLY("vddarm", NULL);



static struct regulator_consumer_supply buck2_consumer[] = {

	{	.supply	= "vddint", },

};

static struct regulator_consumer_supply buck2_consumer =

	REGULATOR_SUPPLY("vddint", NULL);



static struct regulator_init_data aquila_buck1_data = {

	.constraints	= {
@@ -313,8 +311,8 @@ static struct regulator_init_data aquila_buck1_data = { 
		.valid_ops_mask	= REGULATOR_CHANGE_VOLTAGE |

				  REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(buck1_consumer),

	.consumer_supplies	= buck1_consumer,

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &buck1_consumer,

};



static struct regulator_init_data aquila_buck2_data = {
@@ -326,8 +324,8 @@ static struct regulator_init_data aquila_buck2_data = { 
		.valid_ops_mask	= REGULATOR_CHANGE_VOLTAGE |

				  REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(buck2_consumer),

	.consumer_supplies	= buck2_consumer,

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &buck2_consumer,

};



static struct regulator_init_data aquila_buck3_data = {
@@ -391,26 +389,14 @@ static struct max8998_platform_data aquila_max8998_pdata = { 
#endif



static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {

	{

		.dev_name	= "5-001a",

		.supply		= "DBVDD",

	}, {

		.dev_name	= "5-001a",

		.supply		= "AVDD2",

	}, {

		.dev_name	= "5-001a",

		.supply		= "CPVDD",

	},

	REGULATOR_SUPPLY("DBVDD", "5-001a"),

	REGULATOR_SUPPLY("AVDD2", "5-001a"),

	REGULATOR_SUPPLY("CPVDD", "5-001a"),

};



static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {

	{

		.dev_name	= "5-001a",

		.supply		= "SPKVDD1",

	}, {

		.dev_name	= "5-001a",

		.supply		= "SPKVDD2",

	},

	REGULATOR_SUPPLY("SPKVDD1", "5-001a"),

	REGULATOR_SUPPLY("SPKVDD2", "5-001a"),

};



static struct regulator_init_data wm8994_fixed_voltage0_init_data = {
@@ -459,15 +445,11 @@ static struct platform_device wm8994_fixed_voltage1 = { 
	},

};



static struct regulator_consumer_supply wm8994_avdd1_supply = {

	.dev_name	= "5-001a",

	.supply		= "AVDD1",

};

static struct regulator_consumer_supply wm8994_avdd1_supply =

	REGULATOR_SUPPLY("AVDD1", "5-001a");



static struct regulator_consumer_supply wm8994_dcvdd_supply = {

	.dev_name	= "5-001a",

	.supply		= "DCVDD",

};

static struct regulator_consumer_supply wm8994_dcvdd_supply =

	REGULATOR_SUPPLY("DCVDD", "5-001a");



static struct regulator_init_data wm8994_ldo1_data = {

	.constraints	= {

arch/arm/mach-s5pv210/mach-goni.c

+17 −35
Original line number Diff line number Diff line
@@ -436,13 +436,11 @@ static struct regulator_init_data goni_ldo17_data = { 
};



/* BUCK */

static struct regulator_consumer_supply buck1_consumer[] = {

	{	.supply	= "vddarm", },

};

static struct regulator_consumer_supply buck1_consumer =

	REGULATOR_SUPPLY("vddarm", NULL);



static struct regulator_consumer_supply buck2_consumer[] = {

	{	.supply	= "vddint", },

};

static struct regulator_consumer_supply buck2_consumer =

	REGULATOR_SUPPLY("vddint", NULL);



static struct regulator_init_data goni_buck1_data = {

	.constraints	= {
@@ -453,8 +451,8 @@ static struct regulator_init_data goni_buck1_data = { 
		.valid_ops_mask	= REGULATOR_CHANGE_VOLTAGE |

				  REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(buck1_consumer),

	.consumer_supplies	= buck1_consumer,

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &buck1_consumer,

};



static struct regulator_init_data goni_buck2_data = {
@@ -466,8 +464,8 @@ static struct regulator_init_data goni_buck2_data = { 
		.valid_ops_mask	= REGULATOR_CHANGE_VOLTAGE |

				  REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(buck2_consumer),

	.consumer_supplies	= buck2_consumer,

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &buck2_consumer,

};



static struct regulator_init_data goni_buck3_data = {
@@ -531,26 +529,14 @@ static struct max8998_platform_data goni_max8998_pdata = { 
#endif



static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = {

	{

		.dev_name	= "5-001a",

		.supply		= "DBVDD",

	}, {

		.dev_name	= "5-001a",

		.supply		= "AVDD2",

	}, {

		.dev_name	= "5-001a",

		.supply		= "CPVDD",

	},

	REGULATOR_SUPPLY("DBVDD", "5-001a"),

	REGULATOR_SUPPLY("AVDD2", "5-001a"),

	REGULATOR_SUPPLY("CPVDD", "5-001a"),

};



static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = {

	{

		.dev_name	= "5-001a",

		.supply		= "SPKVDD1",

	}, {

		.dev_name	= "5-001a",

		.supply		= "SPKVDD2",

	},

	REGULATOR_SUPPLY("SPKVDD1", "5-001a"),

	REGULATOR_SUPPLY("SPKVDD2", "5-001a"),

};



static struct regulator_init_data wm8994_fixed_voltage0_init_data = {
@@ -599,15 +585,11 @@ static struct platform_device wm8994_fixed_voltage1 = { 
	},

};



static struct regulator_consumer_supply wm8994_avdd1_supply = {

	.dev_name	= "5-001a",

	.supply		= "AVDD1",

};

static struct regulator_consumer_supply wm8994_avdd1_supply =

	REGULATOR_SUPPLY("AVDD1", "5-001a");



static struct regulator_consumer_supply wm8994_dcvdd_supply = {

	.dev_name	= "5-001a",

	.supply		= "DCVDD",

};

static struct regulator_consumer_supply wm8994_dcvdd_supply =

	REGULATOR_SUPPLY("DCVDD", "5-001a");



static struct regulator_init_data wm8994_ldo1_data = {

	.constraints	= {