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

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

OMAP2, 3: DSS2: board files: replace platform_device_register with omap_display_init() 



This patch updated board files to replace platform_device_register or
platform_add_devices of DSS with omap_display_init(). This moves away
registration of DSS from board files into a common place.

Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
Tested-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@ti.com>
Signed-off-by: default avatarSenthilvadivu Guruswamy <svadivu@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent b7ee79ab

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

+1 −13
Original line number Diff line number Diff line
@@ -307,21 +307,9 @@ static struct omap_dss_board_info sdp3430_dss_data = { 
	.default_device	= &sdp3430_lcd_device,

};



static struct platform_device sdp3430_dss_device = {

	.name		= "omapdss",

	.id		= -1,

	.dev		= {

		.platform_data = &sdp3430_dss_data,

	},

};



static struct regulator_consumer_supply sdp3430_vdda_dac_supply =

	REGULATOR_SUPPLY("vdda_dac", "omapdss");



static struct platform_device *sdp3430_devices[] __initdata = {

	&sdp3430_dss_device,

};



static struct omap_board_config_kernel sdp3430_config[] __initdata = {

};
@@ -795,7 +783,7 @@ static void __init omap_3430sdp_init(void) 
{

	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);

	omap3430_i2c_init();

	platform_add_devices(sdp3430_devices, ARRAY_SIZE(sdp3430_devices));

	omap_display_init(&sdp3430_dss_data);

	if (omap_rev() > OMAP3430_REV_ES1_0)

		ts_gpio = SDP3430_TS_GPIO_IRQ_SDPV2;

	else

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

+1 −15
Original line number Diff line number Diff line
@@ -378,24 +378,12 @@ static struct omap_dss_board_info am3517_evm_dss_data = { 
	.default_device	= &am3517_evm_lcd_device,

};



static struct platform_device am3517_evm_dss_device = {

	.name		= "omapdss",

	.id		= -1,

	.dev		= {

		.platform_data	= &am3517_evm_dss_data,

	},

};



/*

 * Board initialization

 */

static struct omap_board_config_kernel am3517_evm_config[] __initdata = {

};



static struct platform_device *am3517_evm_devices[] __initdata = {

	&am3517_evm_dss_device,

};



static void __init am3517_evm_init_early(void)

{

	omap_board_config = am3517_evm_config;
@@ -498,9 +486,7 @@ static void __init am3517_evm_init(void) 
	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);



	am3517_evm_i2c_init();

	platform_add_devices(am3517_evm_devices,

				ARRAY_SIZE(am3517_evm_devices));



	omap_display_init(&am3517_evm_dss_data);

	omap_serial_init();



	/* Configure GPIO for EHCI port */

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

+1 −9
Original line number Diff line number Diff line
@@ -401,14 +401,6 @@ static struct omap_dss_board_info cm_t35_dss_data = { 
	.default_device	= &cm_t35_dvi_device,

};



static struct platform_device cm_t35_dss_device = {

	.name		= "omapdss",

	.id		= -1,

	.dev		= {

		.platform_data = &cm_t35_dss_data,

	},

};



static struct omap2_mcspi_device_config tdo24m_mcspi_config = {

	.turbo_mode	= 0,

	.single_channel	= 1,	/* 0: slave, 1: master */
@@ -468,7 +460,7 @@ static void __init cm_t35_init_display(void) 
	msleep(50);

	gpio_set_value(lcd_en_gpio, 1);



	err = platform_device_register(&cm_t35_dss_device);

	err = omap_display_init(&cm_t35_dss_data);

	if (err) {

		pr_err("CM-T35: failed to register DSS device\n");

		goto err_dev_reg;

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

+1 −9
Original line number Diff line number Diff line
@@ -195,14 +195,6 @@ static struct omap_dss_board_info devkit8000_dss_data = { 
	.default_device = &devkit8000_lcd_device,

};



static struct platform_device devkit8000_dss_device = {

	.name		= "omapdss",

	.id		= -1,

	.dev		= {

		.platform_data = &devkit8000_dss_data,

	},

};



static struct regulator_consumer_supply devkit8000_vdda_dac_supply =

	REGULATOR_SUPPLY("vdda_dac", "omapdss");
@@ -579,7 +571,6 @@ static void __init omap_dm9000_init(void) 
}



static struct platform_device *devkit8000_devices[] __initdata = {

	&devkit8000_dss_device,

	&leds_gpio,

	&keys_gpio,

	&omap_dm9000_dev,
@@ -801,6 +792,7 @@ static void __init devkit8000_init(void) 
	platform_add_devices(devkit8000_devices,

			ARRAY_SIZE(devkit8000_devices));



	omap_display_init(&devkit8000_dss_data);

	spi_register_board_info(devkit8000_spi_board_info,

	ARRAY_SIZE(devkit8000_spi_board_info));

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

+1 −9
Original line number Diff line number Diff line
@@ -485,14 +485,6 @@ static struct omap_dss_board_info igep2_dss_data = { 
	.default_device	= &igep2_dvi_device,

};



static struct platform_device igep2_dss_device = {

	.name	= "omapdss",

	.id	= -1,

	.dev	= {

		.platform_data = &igep2_dss_data,

	},

};



static struct regulator_consumer_supply igep2_vpll2_supply =

	REGULATOR_SUPPLY("vdds_dsi", "omapdss");
@@ -519,7 +511,6 @@ static void __init igep2_display_init(void) 
}



static struct platform_device *igep2_devices[] __initdata = {

	&igep2_dss_device,

	&igep2_vwlan_device,

};
@@ -694,6 +685,7 @@ static void __init igep2_init(void) 
	/* Register I2C busses and drivers */

	igep2_i2c_init();

	platform_add_devices(igep2_devices, ARRAY_SIZE(igep2_devices));

	omap_display_init(&igep2_dss_data);

	omap_serial_init();

	usb_musb_init(&musb_board_data);

	usb_ehci_init(&ehci_pdata);