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

Commit c8aac01b authored by Senthilvadivu Guruswamy's avatar Senthilvadivu Guruswamy Committed by Tomi Valkeinen
Browse files

OMAP2, 3: DSS2: DSI: create platform_driver, move init, exit to driver 



Hwmod adaptation design requires each of the DSS HW IP to be a platform driver.
So a platform_driver for DSI is created and init exit methods are moved from core.c
to its driver probe,remove. pdev member has to be maintained by its own drivers.

Also, vdds_dsi regulator handling is copied to dsi.c, since vdds_dsi regulator is
needed by dpi_init() too. Board files are updated accordingly to add 2 instances of
vdds_dsi regulator.

DSI platform driver is registered from inside omap_dss_probe, in the order desired.

Signed-off-by: default avatarSenthilvadivu Guruswamy <svadivu@ti.com>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 30ea50c9

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

+1 −0
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ static struct regulator_consumer_supply sdp3430_vdda_dac_supplies[] = { 
/* 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[] = {

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

+6 −4
Original line number Diff line number Diff line
@@ -277,8 +277,10 @@ static struct twl4030_gpio_platform_data devkit8000_gpio_data = { 
	.setup		= devkit8000_twl_gpio_setup,

};



static struct regulator_consumer_supply devkit8000_vpll1_supply =

	REGULATOR_SUPPLY("vdds_dsi", "omapdss");

static struct regulator_consumer_supply devkit8000_vpll1_supplies[] = {

	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),

	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),

};



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

static struct regulator_init_data devkit8000_vmmc1 = {
@@ -319,8 +321,8 @@ static struct regulator_init_data devkit8000_vpll1 = { 
		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &devkit8000_vpll1_supply,

	.num_consumer_supplies	= ARRAY_SIZE(devkit8000_vpll1_supplies),

	.consumer_supplies	= devkit8000_vpll1_supplies,

};



/* VAUX4 for ads7846 and nubs */

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

+6 −4
Original line number Diff line number Diff line
@@ -485,8 +485,10 @@ static struct omap_dss_board_info igep2_dss_data = { 
	.default_device	= &igep2_dvi_device,

};



static struct regulator_consumer_supply igep2_vpll2_supply =

	REGULATOR_SUPPLY("vdds_dsi", "omapdss");

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 = {
@@ -499,8 +501,8 @@ static struct regulator_init_data igep2_vpll2 = { 
		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &igep2_vpll2_supply,

	.num_consumer_supplies	= ARRAY_SIZE(igep2_vpll2_supplies),

	.consumer_supplies	= igep2_vpll2_supplies,

};



static void __init igep2_display_init(void)

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

+6 −4
Original line number Diff line number Diff line
@@ -234,8 +234,10 @@ static struct omap_dss_board_info beagle_dss_data = { 
static struct regulator_consumer_supply beagle_vdac_supply =

	REGULATOR_SUPPLY("vdda_dac", "omapdss_venc");



static struct regulator_consumer_supply beagle_vdvi_supply =

	REGULATOR_SUPPLY("vdds_dsi", "omapdss");

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)

{
@@ -422,8 +424,8 @@ static struct regulator_init_data beagle_vpll2 = { 
		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &beagle_vdvi_supply,

	.num_consumer_supplies	= ARRAY_SIZE(beagle_vdvi_supplies),

	.consumer_supplies	= beagle_vdvi_supplies,

};



static struct twl4030_usb_data beagle_usb_data = {

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

+6 −4
Original line number Diff line number Diff line
@@ -560,8 +560,10 @@ static struct regulator_init_data omap3_evm_vdac = { 
};



/* VPLL2 for digital video outputs */

static struct regulator_consumer_supply omap3_evm_vpll2_supply =

	REGULATOR_SUPPLY("vdds_dsi", "omapdss");

static struct regulator_consumer_supply omap3_evm_vpll2_supplies[] = {

	REGULATOR_SUPPLY("vdds_dsi", "omapdss"),

	REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"),

};



static struct regulator_init_data omap3_evm_vpll2 = {

	.constraints = {
@@ -573,8 +575,8 @@ static struct regulator_init_data omap3_evm_vpll2 = { 
		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= 1,

	.consumer_supplies	= &omap3_evm_vpll2_supply,

	.num_consumer_supplies	= ARRAY_SIZE(omap3_evm_vpll2_supplies),

	.consumer_supplies	= omap3_evm_vpll2_supplies,

};



/* ads7846 on SPI */