aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-omap3stalker.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3stalker.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3stalker.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index 8e104980ea26..807c27406792 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -428,12 +428,6 @@ static int __init omap3_stalker_i2c_init(void)
428static struct omap_board_config_kernel omap3_stalker_config[] __initdata = { 428static struct omap_board_config_kernel omap3_stalker_config[] __initdata = {
429}; 429};
430 430
431static void __init omap3_stalker_init_early(void)
432{
433 omap2_init_common_infrastructure();
434 omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL);
435}
436
437static void __init omap3_stalker_init_irq(void) 431static void __init omap3_stalker_init_irq(void)
438{ 432{
439 omap3_init_irq(); 433 omap3_init_irq();
@@ -478,6 +472,7 @@ static void __init omap3_stalker_init(void)
478 omap_display_init(&omap3_stalker_dss_data); 472 omap_display_init(&omap3_stalker_dss_data);
479 473
480 omap_serial_init(); 474 omap_serial_init();
475 omap_sdrc_init(mt46h32m32lf6_sdrc_params, NULL);
481 usb_musb_init(NULL); 476 usb_musb_init(NULL);
482 usbhs_init(&usbhs_bdata); 477 usbhs_init(&usbhs_bdata);
483 omap_ads7846_init(1, OMAP3_STALKER_TS_GPIO, 310, NULL); 478 omap_ads7846_init(1, OMAP3_STALKER_TS_GPIO, 310, NULL);
@@ -496,7 +491,7 @@ MACHINE_START(SBC3530, "OMAP3 STALKER")
496 /* Maintainer: Jason Lam -lzg@ema-tech.com */ 491 /* Maintainer: Jason Lam -lzg@ema-tech.com */
497 .boot_params = 0x80000100, 492 .boot_params = 0x80000100,
498 .map_io = omap3_map_io, 493 .map_io = omap3_map_io,
499 .init_early = omap3_stalker_init_early, 494 .init_early = omap35xx_init_early,
500 .init_irq = omap3_stalker_init_irq, 495 .init_irq = omap3_stalker_init_irq,
501 .init_machine = omap3_stalker_init, 496 .init_machine = omap3_stalker_init,
502 .timer = &omap3_secure_timer, 497 .timer = &omap3_secure_timer,