diff options
| author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2011-02-14 15:40:20 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-02-14 15:40:20 -0800 |
| commit | 3dc3bad6f1b316d79d9d1d596a590b5097cb3dc4 (patch) | |
| tree | 2c8376da2652ac81bbadd08ef2ff8a28e1757c8e /arch/arm/mach-omap2/board-3630sdp.c | |
| parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
| download | talos-op-linux-3dc3bad6f1b316d79d9d1d596a590b5097cb3dc4.tar.gz talos-op-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-3630sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-3630sdp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index 62645640f5e4..16538757291a 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c @@ -69,14 +69,13 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { static struct omap_board_config_kernel sdp_config[] __initdata = { }; -static void __init omap_sdp_init_irq(void) +static void __init omap_sdp_init_early(void) { omap_board_config = sdp_config; omap_board_config_size = ARRAY_SIZE(sdp_config); omap2_init_common_infrastructure(); omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params, h8mbx00u0mer0em_sdrc_params); - omap_init_irq(); } #ifdef CONFIG_OMAP_MUX @@ -216,9 +215,10 @@ static void __init omap_sdp_init(void) MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board") .boot_params = 0x80000100, - .map_io = omap3_map_io, .reserve = omap_reserve, - .init_irq = omap_sdp_init_irq, + .map_io = omap3_map_io, + .init_early = omap_sdp_init_early, + .init_irq = omap_init_irq, .init_machine = omap_sdp_init, .timer = &omap_timer, MACHINE_END |
