summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-rm680.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-08-23 08:57:24 +0200
committerTony Lindgren <tony@atomide.com>2011-08-24 15:19:02 +0200
commit8f5b5a41ebc750ffcc2c410371b2b4998955709e (patch)
tree02a05adecf3ee778ec77d560524b0c2089613405 /arch/arm/mach-omap2/board-rm680.c
parentARM: OMAP: Move omap2_init_common_devices out of init_early (diff)
downloadlinux-8f5b5a41ebc750ffcc2c410371b2b4998955709e.tar.xz
linux-8f5b5a41ebc750ffcc2c410371b2b4998955709e.zip
ARM: OMAP: Introduce SoC specific early_init
Introduce them for each omap variant and just make them all call omap2_init_common_infrastructure for now. Do this for each board-*.c file except for board-generic and board-omap3beagle as they use the same machine ID for multiple SoCs. No functional changes. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-rm680.c')
-rw-r--r--arch/arm/mach-omap2/board-rm680.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c
index a6f76e13c15b..a3182e846b14 100644
--- a/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@ -123,11 +123,6 @@ static void __init rm680_peripherals_init(void)
omap2_hsmmc_init(mmc);
}
-static void __init rm680_init_early(void)
-{
- omap2_init_common_infrastructure();
-}
-
#ifdef CONFIG_OMAP_MUX
static struct omap_board_mux board_mux[] __initdata = {
{ .reg_offset = OMAP_MUX_TERMINATOR },
@@ -158,7 +153,7 @@ MACHINE_START(NOKIA_RM680, "Nokia RM-680 board")
.boot_params = 0x80000100,
.reserve = omap_reserve,
.map_io = rm680_map_io,
- .init_early = rm680_init_early,
+ .init_early = omap3630_init_early,
.init_irq = omap3_init_irq,
.init_machine = rm680_init,
.timer = &omap3_timer,