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 f949a9954d76..7228ae50802d 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
@@ -478,13 +478,6 @@ static int __init overo_spi_init(void) | |||
478 | return 0; | 478 | return 0; |
479 | } | 479 | } |
480 | 480 | ||
481 | static void __init overo_init_early(void) | ||
482 | { | ||
483 | omap2_init_common_infrastructure(); | ||
484 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, | ||
485 | mt46h32m32lf6_sdrc_params); | ||
486 | } | ||
487 | |||
488 | static const struct usbhs_omap_board_data usbhs_bdata __initconst = { | 481 | static const struct usbhs_omap_board_data usbhs_bdata __initconst = { |
489 | .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, | 482 | .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, |
490 | .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, | 483 | .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, |
@@ -514,6 +507,8 @@ static void __init overo_init(void) | |||
514 | overo_i2c_init(); | 507 | overo_i2c_init(); |
515 | omap_display_init(&overo_dss_data); | 508 | omap_display_init(&overo_dss_data); |
516 | omap_serial_init(); | 509 | omap_serial_init(); |
510 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, | ||
511 | mt46h32m32lf6_sdrc_params); | ||
517 | omap_nand_flash_init(0, overo_nand_partitions, | 512 | omap_nand_flash_init(0, overo_nand_partitions, |
518 | ARRAY_SIZE(overo_nand_partitions)); | 513 | ARRAY_SIZE(overo_nand_partitions)); |
519 | usb_musb_init(NULL); | 514 | usb_musb_init(NULL); |
@@ -564,7 +559,7 @@ MACHINE_START(OVERO, "Gumstix Overo") | |||
564 | .boot_params = 0x80000100, | 559 | .boot_params = 0x80000100, |
565 | .reserve = omap_reserve, | 560 | .reserve = omap_reserve, |
566 | .map_io = omap3_map_io, | 561 | .map_io = omap3_map_io, |
567 | .init_early = overo_init_early, | 562 | .init_early = omap35xx_init_early, |
568 | .init_irq = omap3_init_irq, | 563 | .init_irq = omap3_init_irq, |
569 | .init_machine = overo_init, | 564 | .init_machine = overo_init, |
570 | .timer = &omap3_timer, | 565 | .timer = &omap3_timer, |