aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-devkit8000.c
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@arm.linux.org.uk>2011-02-14 18:40:20 -0500
committerTony Lindgren <tony@atomide.com>2011-02-14 18:40:20 -0500
commit3dc3bad6f1b316d79d9d1d596a590b5097cb3dc4 (patch)
tree2c8376da2652ac81bbadd08ef2ff8a28e1757c8e /arch/arm/mach-omap2/board-devkit8000.c
parent100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff)
ARM: OMAP2: use early init hook
Move non-mapping and non-irq initialization code out of .map_io and .init_irq respectively into the new init_early hook. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-devkit8000.c')
-rw-r--r--arch/arm/mach-omap2/board-devkit8000.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 9a2a31e011ce..af742887e834 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -456,11 +456,15 @@ static struct platform_device keys_gpio = {
456}; 456};
457 457
458 458
459static void __init devkit8000_init_irq(void) 459static void __init devkit8000_init_early(void)
460{ 460{
461 omap2_init_common_infrastructure(); 461 omap2_init_common_infrastructure();
462 omap2_init_common_devices(mt46h32m32lf6_sdrc_params, 462 omap2_init_common_devices(mt46h32m32lf6_sdrc_params,
463 mt46h32m32lf6_sdrc_params); 463 mt46h32m32lf6_sdrc_params);
464}
465
466static void __init devkit8000_init_irq(void)
467{
464 omap_init_irq(); 468 omap_init_irq();
465#ifdef CONFIG_OMAP_32K_TIMER 469#ifdef CONFIG_OMAP_32K_TIMER
466 omap2_gp_clockevent_set_gptimer(12); 470 omap2_gp_clockevent_set_gptimer(12);
@@ -813,8 +817,9 @@ static void __init devkit8000_init(void)
813 817
814MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000") 818MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000")
815 .boot_params = 0x80000100, 819 .boot_params = 0x80000100,
816 .map_io = omap3_map_io,
817 .reserve = omap_reserve, 820 .reserve = omap_reserve,
821 .map_io = omap3_map_io,
822 .init_early = devkit8000_init_early,
818 .init_irq = devkit8000_init_irq, 823 .init_irq = devkit8000_init_irq,
819 .init_machine = devkit8000_init, 824 .init_machine = devkit8000_init,
820 .timer = &omap_timer, 825 .timer = &omap_timer,