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

Commit 786b01a8 authored by Oleg Drokin's avatar Oleg Drokin Committed by Tony Lindgren
Browse files

cleanup regulator supply definitions in mach-omap2 



to use REGULATOR_SUPPLY arrays.

CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
CC: Mike Rapoport <mike@compulab.co.il>
CC: Nishant Kamat <nskamat@ti.com>
CC: Steve Sakoman <steve@sakoman.com>
CC: Felipe Balbi <balbi@ti.com>
CC: Santosh Shilimkar <santosh.shilimkar@ti.com>
CC: peter.barada@logicpd.com
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2c53b436

arch/arm/mach-omap2/board-4430sdp.c

+4 −9
Original line number Diff line number Diff line
@@ -333,16 +333,11 @@ static struct omap2_hsmmc_info mmc[] = { 
};



static struct regulator_consumer_supply sdp4430_vaux_supply[] = {

	{

		.supply = "vmmc",

		.dev_name = "omap_hsmmc.1",

	},

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),

};



static struct regulator_consumer_supply sdp4430_vmmc_supply[] = {

	{

		.supply = "vmmc",

		.dev_name = "omap_hsmmc.0",

	},

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};



static int omap4_twl6030_hsmmc_late_init(struct device *dev)
@@ -399,7 +394,7 @@ static struct regulator_init_data sdp4430_vaux1 = { 
					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies  = 1,

	.num_consumer_supplies  = ARRAY_SIZE(sdp4430_vaux_supply),

	.consumer_supplies      = sdp4430_vaux_supply,

};

arch/arm/mach-omap2/board-cm-t35.c

+18 −16
Original line number Diff line number Diff line
@@ -337,19 +337,21 @@ static void __init cm_t35_init_display(void) 
	}

}



static struct regulator_consumer_supply cm_t35_vmmc1_supply = {

	.supply			= "vmmc",

static struct regulator_consumer_supply cm_t35_vmmc1_supply[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};



static struct regulator_consumer_supply cm_t35_vsim_supply = {

	.supply			= "vmmc_aux",

static struct regulator_consumer_supply cm_t35_vsim_supply[] = {

	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"),

};



static struct regulator_consumer_supply cm_t35_vdac_supply =

	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc");

static struct regulator_consumer_supply cm_t35_vdac_supply[] = {

	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"),

};



static struct regulator_consumer_supply cm_t35_vdvi_supply =

	REGULATOR_SUPPLY("vdvi", "omapdss");

static struct regulator_consumer_supply cm_t35_vdvi_supply[] = {

	REGULATOR_SUPPLY("vdvi", "omapdss"),

};



/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */

static struct regulator_init_data cm_t35_vmmc1 = {
@@ -362,8 +364,8 @@ static struct regulator_init_data cm_t35_vmmc1 = { 
					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &cm_t35_vmmc1_supply,

	.num_consumer_supplies	= ARRAY_SIZE(cm_t35_vmmc1_supply),

	.consumer_supplies	= cm_t35_vmmc1_supply,

};



/* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */
@@ -377,8 +379,8 @@ static struct regulator_init_data cm_t35_vsim = { 
					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &cm_t35_vsim_supply,

	.num_consumer_supplies	= ARRAY_SIZE(cm_t35_vsim_supply),

	.consumer_supplies	= cm_t35_vsim_supply,

};



/* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */
@@ -391,8 +393,8 @@ static struct regulator_init_data cm_t35_vdac = { 
		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &cm_t35_vdac_supply,

	.num_consumer_supplies	= ARRAY_SIZE(cm_t35_vdac_supply),

	.consumer_supplies	= cm_t35_vdac_supply,

};



/* VPLL2 for digital video outputs */
@@ -406,8 +408,8 @@ static struct regulator_init_data cm_t35_vpll2 = { 
		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &cm_t35_vdvi_supply,

	.num_consumer_supplies	= ARRAY_SIZE(cm_t35_vdvi_supply),

	.consumer_supplies	= cm_t35_vdvi_supply,

};



static struct twl4030_usb_data cm_t35_usb_data = {

arch/arm/mach-omap2/board-devkit8000.c

+15 −13
Original line number Diff line number Diff line
@@ -130,13 +130,14 @@ static void devkit8000_panel_disable_dvi(struct omap_dss_device *dssdev) 
		gpio_set_value_cansleep(dssdev->reset_gpio, 0);

}



static struct regulator_consumer_supply devkit8000_vmmc1_supply =

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0");



static struct regulator_consumer_supply devkit8000_vmmc1_supply[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};



/* ads7846 on SPI */

static struct regulator_consumer_supply devkit8000_vio_supply =

	REGULATOR_SUPPLY("vcc", "spi2.0");

static struct regulator_consumer_supply devkit8000_vio_supply[] = {

	REGULATOR_SUPPLY("vcc", "spi2.0"),

};



static struct panel_generic_dpi_data lcd_panel = {

	.name			= "generic",
@@ -186,8 +187,9 @@ static struct omap_dss_board_info devkit8000_dss_data = { 
	.default_device = &devkit8000_lcd_device,

};



static struct regulator_consumer_supply devkit8000_vdda_dac_supply =

	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc");

static struct regulator_consumer_supply devkit8000_vdda_dac_supply[] = {

	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"),

};



static uint32_t board_keymap[] = {

	KEY(0, 0, KEY_1),
@@ -284,8 +286,8 @@ static struct regulator_init_data devkit8000_vmmc1 = { 
					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &devkit8000_vmmc1_supply,

	.num_consumer_supplies	= ARRAY_SIZE(devkit8000_vmmc1_supply),

	.consumer_supplies	= devkit8000_vmmc1_supply,

};



/* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */
@@ -298,8 +300,8 @@ static struct regulator_init_data devkit8000_vdac = { 
		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &devkit8000_vdda_dac_supply,

	.num_consumer_supplies	= ARRAY_SIZE(devkit8000_vdda_dac_supply),

	.consumer_supplies	= devkit8000_vdda_dac_supply,

};



/* VPLL1 for digital video outputs */
@@ -327,8 +329,8 @@ static struct regulator_init_data devkit8000_vio = { 
		.valid_ops_mask         = REGULATOR_CHANGE_MODE

			| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies  = 1,

	.consumer_supplies      = &devkit8000_vio_supply,

	.num_consumer_supplies  = ARRAY_SIZE(devkit8000_vio_supply),

	.consumer_supplies      = devkit8000_vio_supply,

};



static struct twl4030_usb_data devkit8000_usb_data = {

arch/arm/mach-omap2/board-igep0020.c

+15 −12
Original line number Diff line number Diff line
@@ -222,8 +222,9 @@ static inline void __init igep2_init_smsc911x(void) 
static inline void __init igep2_init_smsc911x(void) { }

#endif



static struct regulator_consumer_supply igep_vmmc1_supply =

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0");

static struct regulator_consumer_supply igep_vmmc1_supply[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};



/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */

static struct regulator_init_data igep_vmmc1 = {
@@ -236,12 +237,13 @@ static struct regulator_init_data igep_vmmc1 = { 
					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies  = 1,

	.consumer_supplies      = &igep_vmmc1_supply,

	.num_consumer_supplies  = ARRAY_SIZE(igep_vmmc1_supply),

	.consumer_supplies      = igep_vmmc1_supply,

};



static struct regulator_consumer_supply igep_vio_supply =

	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1");

static struct regulator_consumer_supply igep_vio_supply[] = {

	REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1"),

};



static struct regulator_init_data igep_vio = {

	.constraints = {
@@ -254,20 +256,21 @@ static struct regulator_init_data igep_vio = { 
					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies  = 1,

	.consumer_supplies      = &igep_vio_supply,

	.num_consumer_supplies  = ARRAY_SIZE(igep_vio_supply),

	.consumer_supplies      = igep_vio_supply,

};



static struct regulator_consumer_supply igep_vmmc2_supply =

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1");

static struct regulator_consumer_supply igep_vmmc2_supply[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),

};



static struct regulator_init_data igep_vmmc2 = {

	.constraints		= {

		.valid_modes_mask	= REGULATOR_MODE_NORMAL,

		.always_on		= 1,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &igep_vmmc2_supply,

	.num_consumer_supplies	= ARRAY_SIZE(igep_vmmc2_supply),

	.consumer_supplies	= igep_vmmc2_supply,

};



static struct fixed_voltage_config igep_vwlan = {

arch/arm/mach-omap2/board-ldp.c

+4 −4
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@ static struct twl4030_madc_platform_data ldp_madc_data = { 
	.irq_line	= 1,

};



static struct regulator_consumer_supply ldp_vmmc1_supply = {

	.supply			= "vmmc",

static struct regulator_consumer_supply ldp_vmmc1_supply[] = {

	REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),

};



/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
@@ -228,8 +228,8 @@ static struct regulator_init_data ldp_vmmc1 = { 
					| REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &ldp_vmmc1_supply,

	.num_consumer_supplies	= ARRAY_SIZE(ldp_vmmc1_supply),

	.consumer_supplies	= ldp_vmmc1_supply,

};



/* ads7846 on SPI */