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.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 0d5a9e46a6af..2d24e287e8c1 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -519,12 +519,6 @@ static int __init omap3_evm_i2c_init(void)
519static struct omap_board_config_kernel omap3_evm_config[] __initdata = { 519static struct omap_board_config_kernel omap3_evm_config[] __initdata = {
520}; 520};
521 521
522static void __init omap3_evm_init_early(void)
523{
524 omap2_init_common_infrastructure();
525 omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL);
526}
527
528static struct usbhs_omap_board_data usbhs_bdata __initdata = { 522static struct usbhs_omap_board_data usbhs_bdata __initdata = {
529 523
530 .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, 524 .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
@@ -639,6 +633,7 @@ static void __init omap3_evm_init(void)
639 omap_display_init(&omap3_evm_dss_data); 633 omap_display_init(&omap3_evm_dss_data);
640 634
641 omap_serial_init(); 635 omap_serial_init();
636 omap_sdrc_init(mt46h32m32lf6_sdrc_params, NULL);
642 637
643 /* OMAP3EVM uses ISP1504 phy and so register nop transceiver */ 638 /* OMAP3EVM uses ISP1504 phy and so register nop transceiver */
644 usb_nop_xceiv_register(); 639 usb_nop_xceiv_register();
@@ -683,7 +678,7 @@ MACHINE_START(OMAP3EVM, "OMAP3 EVM")
683 .atag_offset = 0x100, 678 .atag_offset = 0x100,
684 .reserve = omap_reserve, 679 .reserve = omap_reserve,
685 .map_io = omap3_map_io, 680 .map_io = omap3_map_io,
686 .init_early = omap3_evm_init_early, 681 .init_early = omap35xx_init_early,
687 .init_irq = omap3_init_irq, 682 .init_irq = omap3_init_irq,
688 .init_machine = omap3_evm_init, 683 .init_machine = omap3_evm_init,
689 .timer = &omap3_timer, 684 .timer = &omap3_timer,