aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3pandora.c
diff options
context:
space:
mode:
authorSenthilvadivu Guruswamy <svadivu@ti.com>2011-02-22 04:24:50 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-02-23 02:34:25 -0500
commitd5e13227c32f12de3afb2e26a86bc9f3e5aaf7b6 (patch)
tree209fdc2805cff6082667ee839e5d88e597af0414 /arch/arm/mach-omap2/board-omap3pandora.c
parentb7ee79abcc1bd549eadf5a9852657058e6ecca47 (diff)
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: Kevin Hilman <khilman@ti.com> Tested-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Sumit Semwal <sumit.semwal@ti.com> Signed-off-by: Senthilvadivu Guruswamy <svadivu@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3pandora.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3pandora.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index b91f74ce3a9f..17ef5479c7ff 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -253,14 +253,6 @@ static struct omap_dss_board_info pandora_dss_data = {
253 .default_device = &pandora_lcd_device, 253 .default_device = &pandora_lcd_device,
254}; 254};
255 255
256static struct platform_device pandora_dss_device = {
257 .name = "omapdss",
258 .id = -1,
259 .dev = {
260 .platform_data = &pandora_dss_data,
261 },
262};
263
264static void pandora_wl1251_init_card(struct mmc_card *card) 256static void pandora_wl1251_init_card(struct mmc_card *card)
265{ 257{
266 /* 258 /*
@@ -676,7 +668,6 @@ fail:
676static struct platform_device *omap3pandora_devices[] __initdata = { 668static struct platform_device *omap3pandora_devices[] __initdata = {
677 &pandora_leds_gpio, 669 &pandora_leds_gpio,
678 &pandora_keys_gpio, 670 &pandora_keys_gpio,
679 &pandora_dss_device,
680 &pandora_vwlan_device, 671 &pandora_vwlan_device,
681}; 672};
682 673
@@ -711,6 +702,7 @@ static void __init omap3pandora_init(void)
711 pandora_wl1251_init(); 702 pandora_wl1251_init();
712 platform_add_devices(omap3pandora_devices, 703 platform_add_devices(omap3pandora_devices,
713 ARRAY_SIZE(omap3pandora_devices)); 704 ARRAY_SIZE(omap3pandora_devices));
705 omap_display_init(&pandora_dss_data);
714 omap_serial_init(); 706 omap_serial_init();
715 spi_register_board_info(omap3pandora_spi_board_info, 707 spi_register_board_info(omap3pandora_spi_board_info,
716 ARRAY_SIZE(omap3pandora_spi_board_info)); 708 ARRAY_SIZE(omap3pandora_spi_board_info));