diff options
| author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2011-02-15 00:40:20 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-15 00:40:20 +0100 |
| commit | 3dc3bad6f1b316d79d9d1d596a590b5097cb3dc4 (patch) | |
| tree | 2c8376da2652ac81bbadd08ef2ff8a28e1757c8e /arch/arm/mach-omap2/board-rx51.c | |
| parent | Linux 2.6.38-rc4 (diff) | |
| download | linux-3dc3bad6f1b316d79d9d1d596a590b5097cb3dc4.tar.xz linux-3dc3bad6f1b316d79d9d1d596a590b5097cb3dc4.zip | |
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-rx51.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index f53fc551c58f..3cf72fe6d75b 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c @@ -98,7 +98,7 @@ static struct omap_board_config_kernel rx51_config[] = { { OMAP_TAG_LCD, &rx51_lcd_config }, }; -static void __init rx51_init_irq(void) +static void __init rx51_init_early(void) { struct omap_sdrc_params *sdrc_params; @@ -108,7 +108,6 @@ static void __init rx51_init_irq(void) omap2_init_common_infrastructure(); sdrc_params = nokia_get_sdram_timings(); omap2_init_common_devices(sdrc_params, sdrc_params); - omap_init_irq(); } extern void __init rx51_peripherals_init(void); @@ -149,9 +148,10 @@ static void __init rx51_map_io(void) MACHINE_START(NOKIA_RX51, "Nokia RX-51 board") /* Maintainer: Lauri Leukkunen <lauri.leukkunen@nokia.com> */ .boot_params = 0x80000100, - .map_io = rx51_map_io, .reserve = omap_reserve, - .init_irq = rx51_init_irq, + .map_io = rx51_map_io, + .init_early = rx51_init_early, + .init_irq = omap_init_irq, .init_machine = rx51_init, .timer = &omap_timer, MACHINE_END |