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

Commit b252b0ef authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

OMAP3: Move common regulator configuration to twl-common 



Some regulator config can be moved out from board files,
since they are close to identical.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
parent 827ed9ae

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

+7 −44
Original line number Diff line number Diff line
@@ -283,16 +283,6 @@ static struct regulator_consumer_supply sdp3430_vaux3_supplies[] = { 
	REGULATOR_SUPPLY("vcc", "spi1.0"),

};



static struct regulator_consumer_supply sdp3430_vdda_dac_supplies[] = {

	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"),

};



/* VPLL2 for digital video outputs */

static struct regulator_consumer_supply sdp3430_vpll2_supplies[] = {

	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),

	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),

};



static struct regulator_consumer_supply sdp3430_vmmc1_supplies[] = {

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

};
@@ -409,36 +399,6 @@ static struct regulator_init_data sdp3430_vsim = { 
	.consumer_supplies	= sdp3430_vsim_supplies,

};



/* VDAC for DSS driving S-Video */

static struct regulator_init_data sdp3430_vdac = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(sdp3430_vdda_dac_supplies),

	.consumer_supplies	= sdp3430_vdda_dac_supplies,

};



static struct regulator_init_data sdp3430_vpll2 = {

	.constraints = {

		.name			= "VDVI",

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(sdp3430_vpll2_supplies),

	.consumer_supplies	= sdp3430_vpll2_supplies,

};



static struct twl4030_platform_data sdp3430_twldata = {

	/* platform_data for children goes here */

	.gpio		= &sdp3430_gpio_data,
@@ -451,8 +411,6 @@ static struct twl4030_platform_data sdp3430_twldata = { 
	.vmmc1		= &sdp3430_vmmc1,

	.vmmc2		= &sdp3430_vmmc2,

	.vsim		= &sdp3430_vsim,

	.vdac		= &sdp3430_vdac,

	.vpll2		= &sdp3430_vpll2,

};



static int __init omap3430_i2c_init(void)
@@ -460,7 +418,12 @@ static int __init omap3430_i2c_init(void) 
	/* i2c1 for PMIC only */

	omap3_pmic_get_config(&sdp3430_twldata,

			TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_BCI |

			  TWL_COMMON_PDATA_MADC | TWL_COMMON_PDATA_AUDIO, 0);

			TWL_COMMON_PDATA_MADC | TWL_COMMON_PDATA_AUDIO,

			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);

	sdp3430_twldata.vdac->constraints.apply_uV = true;

	sdp3430_twldata.vpll2->constraints.apply_uV = true;

	sdp3430_twldata.vpll2->constraints.name = "VDVI";



	omap3_pmic_init("twl4030", &sdp3430_twldata);



	/* i2c2 on camera connector (for sensor control) and optional isp1301 */

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

+8 −36
Original line number Diff line number Diff line
@@ -343,10 +343,6 @@ 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_vdvi_supply[] = {

	REGULATOR_SUPPLY("vdvi", "omapdss"),

};
@@ -381,35 +377,6 @@ static struct regulator_init_data cm_t35_vsim = { 
	.consumer_supplies	= cm_t35_vsim_supply,

};



/* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */

static struct regulator_init_data cm_t35_vdac = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(cm_t35_vdac_supply),

	.consumer_supplies	= cm_t35_vdac_supply,

};



/* VPLL2 for digital video outputs */

static struct regulator_init_data cm_t35_vpll2 = {

	.constraints = {

		.name			= "VDVI",

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(cm_t35_vdvi_supply),

	.consumer_supplies	= cm_t35_vdvi_supply,

};



static uint32_t cm_t35_keymap[] = {

	KEY(0, 0, KEY_A),	KEY(0, 1, KEY_B),	KEY(0, 2, KEY_LEFT),

	KEY(1, 0, KEY_UP),	KEY(1, 1, KEY_ENTER),	KEY(1, 2, KEY_DOWN),
@@ -493,13 +460,18 @@ static struct twl4030_platform_data cm_t35_twldata = { 
	.gpio		= &cm_t35_gpio_data,

	.vmmc1		= &cm_t35_vmmc1,

	.vsim		= &cm_t35_vsim,

	.vdac		= &cm_t35_vdac,

	.vpll2		= &cm_t35_vpll2,

};



static void __init cm_t35_init_i2c(void)

{

	omap3_pmic_get_config(&cm_t35_twldata, TWL_COMMON_PDATA_USB, 0);

	omap3_pmic_get_config(&cm_t35_twldata, TWL_COMMON_PDATA_USB,

			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);



	cm_t35_twldata.vpll2->constraints.name = "VDVI";

	cm_t35_twldata.vpll2->num_consumer_supplies =

						ARRAY_SIZE(cm_t35_vdvi_supply);

	cm_t35_twldata.vpll2->consumer_supplies = cm_t35_vdvi_supply;



	omap3_pmic_init("tps65930", &cm_t35_twldata);

}

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

+2 −20
Original line number Diff line number Diff line
@@ -186,10 +186,6 @@ 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 uint32_t board_keymap[] = {

	KEY(0, 0, KEY_1),

	KEY(1, 0, KEY_2),
@@ -289,20 +285,6 @@ static struct regulator_init_data devkit8000_vmmc1 = { 
	.consumer_supplies	= devkit8000_vmmc1_supply,

};



/* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */

static struct regulator_init_data devkit8000_vdac = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(devkit8000_vdda_dac_supply),

	.consumer_supplies	= devkit8000_vdda_dac_supply,

};



/* VPLL1 for digital video outputs */

static struct regulator_init_data devkit8000_vpll1 = {

	.constraints = {
@@ -336,7 +318,6 @@ static struct twl4030_platform_data devkit8000_twldata = { 
	/* platform_data for children goes here */

	.gpio		= &devkit8000_gpio_data,

	.vmmc1		= &devkit8000_vmmc1,

	.vdac		= &devkit8000_vdac,

	.vpll1		= &devkit8000_vpll1,

	.vio		= &devkit8000_vio,

	.keypad		= &devkit8000_kp_data,
@@ -345,7 +326,8 @@ static struct twl4030_platform_data devkit8000_twldata = { 
static int __init devkit8000_i2c_init(void)

{

	omap3_pmic_get_config(&devkit8000_twldata,

			  TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_AUDIO, 0);

			  TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_AUDIO,

			  TWL_COMMON_REGULATOR_VDAC);

	omap3_pmic_init("tps65930", &devkit8000_twldata);

	/* Bus 3 is attached to the DVI port where devices like the pico DLP

	 * projector don't work reliably with 400kHz */

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

+5 −23
Original line number Diff line number Diff line
@@ -479,26 +479,6 @@ static struct omap_dss_board_info igep2_dss_data = { 
	.default_device	= &igep2_dvi_device,

};



static struct regulator_consumer_supply igep2_vpll2_supplies[] = {

	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),

	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),

};



static struct regulator_init_data igep2_vpll2 = {

	.constraints = {

		.name			= "VDVI",

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.apply_uV		= true,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(igep2_vpll2_supplies),

	.consumer_supplies	= igep2_vpll2_supplies,

};



static void __init igep2_display_init(void)

{

	int err = gpio_request_one(IGEP2_GPIO_DVI_PUP, GPIOF_OUT_INIT_HIGH,
@@ -579,9 +559,11 @@ static void __init igep_i2c_init(void) 
			pr_warning("IGEP2: Could not register I2C3 bus (%d)\n", ret);



		igep_twldata.keypad	= &igep2_keypad_pdata;

		igep_twldata.vpll2	= &igep2_vpll2;

		/* Use common codec data */

		omap3_pmic_get_config(&igep_twldata, TWL_COMMON_PDATA_AUDIO, 0);

		/* Get common pmic data */

		omap3_pmic_get_config(&igep_twldata, TWL_COMMON_PDATA_AUDIO,

				      TWL_COMMON_REGULATOR_VPLL2);

		igep_twldata.vpll2->constraints.apply_uV = true;

		igep_twldata.vpll2->constraints.name = "VDVI";

	}



	omap3_pmic_init("twl4030", &igep_twldata);

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

+5 −41
Original line number Diff line number Diff line
@@ -209,15 +209,6 @@ static struct omap_dss_board_info beagle_dss_data = { 
	.default_device = &beagle_dvi_device,

};



static struct regulator_consumer_supply beagle_vdac_supply[] = {

	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"),

};



static struct regulator_consumer_supply beagle_vdvi_supplies[] = {

	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),

	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),

};



static void __init beagle_display_init(void)

{

	int r;
@@ -351,42 +342,11 @@ static struct regulator_init_data beagle_vsim = { 
	.consumer_supplies	= beagle_vsim_supply,

};



/* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */

static struct regulator_init_data beagle_vdac = {

	.constraints = {

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(beagle_vdac_supply),

	.consumer_supplies	= beagle_vdac_supply,

};



/* VPLL2 for digital video outputs */

static struct regulator_init_data beagle_vpll2 = {

	.constraints = {

		.name			= "VDVI",

		.min_uV			= 1800000,

		.max_uV			= 1800000,

		.valid_modes_mask	= REGULATOR_MODE_NORMAL

					| REGULATOR_MODE_STANDBY,

		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(beagle_vdvi_supplies),

	.consumer_supplies	= beagle_vdvi_supplies,

};



static struct twl4030_platform_data beagle_twldata = {

	/* platform_data for children goes here */

	.gpio		= &beagle_gpio_data,

	.vmmc1		= &beagle_vmmc1,

	.vsim		= &beagle_vsim,

	.vdac		= &beagle_vdac,

	.vpll2		= &beagle_vpll2,

};



static struct i2c_board_info __initdata beagle_i2c_eeprom[] = {
@@ -398,7 +358,11 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = { 
static int __init omap3_beagle_i2c_init(void)

{

	omap3_pmic_get_config(&beagle_twldata,

			  TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_AUDIO, 0);

			TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_AUDIO,

			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);



	beagle_twldata.vpll2->constraints.name = "VDVI";



	omap3_pmic_init("twl4030", &beagle_twldata);

	/* Bus 3 is attached to the DVI port where devices like the pico DLP

	 * projector don't work reliably with 400kHz */