diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-overo.c')
-rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index ec0f60c1cb7c..4cf7aeabab86 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
@@ -479,13 +479,6 @@ static int __init overo_spi_init(void) | |||
479 | return 0; | 479 | return 0; |
480 | } | 480 | } |
481 | 481 | ||
482 | static void __init overo_init_early(void) | ||
483 | { | ||
484 | omap2_init_common_infrastructure(); | ||
485 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, | ||
486 | mt46h32m32lf6_sdrc_params); | ||
487 | } | ||
488 | |||
489 | static const struct usbhs_omap_board_data usbhs_bdata __initconst = { | 482 | static const struct usbhs_omap_board_data usbhs_bdata __initconst = { |
490 | .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, | 483 | .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, |
491 | .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, | 484 | .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, |
@@ -515,6 +508,8 @@ static void __init overo_init(void) | |||
515 | overo_i2c_init(); | 508 | overo_i2c_init(); |
516 | omap_display_init(&overo_dss_data); | 509 | omap_display_init(&overo_dss_data); |
517 | omap_serial_init(); | 510 | omap_serial_init(); |
511 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, | ||
512 | mt46h32m32lf6_sdrc_params); | ||
518 | omap_nand_flash_init(0, overo_nand_partitions, | 513 | omap_nand_flash_init(0, overo_nand_partitions, |
519 | ARRAY_SIZE(overo_nand_partitions)); | 514 | ARRAY_SIZE(overo_nand_partitions)); |
520 | usb_musb_init(NULL); | 515 | usb_musb_init(NULL); |
@@ -565,7 +560,7 @@ MACHINE_START(OVERO, "Gumstix Overo") | |||
565 | .atag_offset = 0x100, | 560 | .atag_offset = 0x100, |
566 | .reserve = omap_reserve, | 561 | .reserve = omap_reserve, |
567 | .map_io = omap3_map_io, | 562 | .map_io = omap3_map_io, |
568 | .init_early = overo_init_early, | 563 | .init_early = omap35xx_init_early, |
569 | .init_irq = omap3_init_irq, | 564 | .init_irq = omap3_init_irq, |
570 | .init_machine = overo_init, | 565 | .init_machine = overo_init, |
571 | .timer = &omap3_timer, | 566 | .timer = &omap3_timer, |