aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3evm.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 5e38da97decc..8afafddadfb6 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -328,14 +328,6 @@ static struct omap_dss_board_info omap3_evm_dss_data = {
328 .default_device = &omap3_evm_lcd_device, 328 .default_device = &omap3_evm_lcd_device,
329}; 329};
330 330
331static struct platform_device omap3_evm_dss_device = {
332 .name = "omapdss",
333 .id = -1,
334 .dev = {
335 .platform_data = &omap3_evm_dss_data,
336 },
337};
338
339static struct regulator_consumer_supply omap3evm_vmmc1_supply = { 331static struct regulator_consumer_supply omap3evm_vmmc1_supply = {
340 .supply = "vmmc", 332 .supply = "vmmc",
341}; 333};
@@ -631,10 +623,6 @@ static void __init omap3_evm_init_early(void)
631 omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL); 623 omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL);
632} 624}
633 625
634static struct platform_device *omap3_evm_devices[] __initdata = {
635 &omap3_evm_dss_device,
636};
637
638static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = { 626static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = {
639 627
640 .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN, 628 .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
@@ -672,7 +660,7 @@ static void __init omap3_evm_init(void)
672 660
673 omap3_evm_i2c_init(); 661 omap3_evm_i2c_init();
674 662
675 platform_add_devices(omap3_evm_devices, ARRAY_SIZE(omap3_evm_devices)); 663 omap_display_init(&omap3_evm_dss_data);
676 664
677 spi_register_board_info(omap3evm_spi_board_info, 665 spi_register_board_info(omap3evm_spi_board_info,
678 ARRAY_SIZE(omap3evm_spi_board_info)); 666 ARRAY_SIZE(omap3evm_spi_board_info));