diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3stalker.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 8e104980ea26..fa58a0f1584a 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
@@ -428,17 +428,6 @@ static int __init omap3_stalker_i2c_init(void) | |||
428 | static struct omap_board_config_kernel omap3_stalker_config[] __initdata = { | 428 | static struct omap_board_config_kernel omap3_stalker_config[] __initdata = { |
429 | }; | 429 | }; |
430 | 430 | ||
431 | static void __init omap3_stalker_init_early(void) | ||
432 | { | ||
433 | omap2_init_common_infrastructure(); | ||
434 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, NULL); | ||
435 | } | ||
436 | |||
437 | static void __init omap3_stalker_init_irq(void) | ||
438 | { | ||
439 | omap3_init_irq(); | ||
440 | } | ||
441 | |||
442 | static struct platform_device *omap3_stalker_devices[] __initdata = { | 431 | static struct platform_device *omap3_stalker_devices[] __initdata = { |
443 | &keys_gpio, | 432 | &keys_gpio, |
444 | }; | 433 | }; |
@@ -478,6 +467,7 @@ static void __init omap3_stalker_init(void) | |||
478 | omap_display_init(&omap3_stalker_dss_data); | 467 | omap_display_init(&omap3_stalker_dss_data); |
479 | 468 | ||
480 | omap_serial_init(); | 469 | omap_serial_init(); |
470 | omap_sdrc_init(mt46h32m32lf6_sdrc_params, NULL); | ||
481 | usb_musb_init(NULL); | 471 | usb_musb_init(NULL); |
482 | usbhs_init(&usbhs_bdata); | 472 | usbhs_init(&usbhs_bdata); |
483 | omap_ads7846_init(1, OMAP3_STALKER_TS_GPIO, 310, NULL); | 473 | omap_ads7846_init(1, OMAP3_STALKER_TS_GPIO, 310, NULL); |
@@ -496,8 +486,8 @@ MACHINE_START(SBC3530, "OMAP3 STALKER") | |||
496 | /* Maintainer: Jason Lam -lzg@ema-tech.com */ | 486 | /* Maintainer: Jason Lam -lzg@ema-tech.com */ |
497 | .boot_params = 0x80000100, | 487 | .boot_params = 0x80000100, |
498 | .map_io = omap3_map_io, | 488 | .map_io = omap3_map_io, |
499 | .init_early = omap3_stalker_init_early, | 489 | .init_early = omap35xx_init_early, |
500 | .init_irq = omap3_stalker_init_irq, | 490 | .init_irq = omap3_init_irq, |
501 | .init_machine = omap3_stalker_init, | 491 | .init_machine = omap3_stalker_init, |
502 | .timer = &omap3_secure_timer, | 492 | .timer = &omap3_secure_timer, |
503 | MACHINE_END | 493 | MACHINE_END |