diff options
author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2011-02-14 18:40:20 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-02-14 18:40:20 -0500 |
commit | 3dc3bad6f1b316d79d9d1d596a590b5097cb3dc4 (patch) | |
tree | 2c8376da2652ac81bbadd08ef2ff8a28e1757c8e /arch/arm/mach-omap2/board-overo.c | |
parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (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-overo.c')
-rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index cb26e5d8268d..a33ec0edec13 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
@@ -409,14 +409,13 @@ static struct omap_board_config_kernel overo_config[] __initdata = { | |||
409 | { OMAP_TAG_LCD, &overo_lcd_config }, | 409 | { OMAP_TAG_LCD, &overo_lcd_config }, |
410 | }; | 410 | }; |
411 | 411 | ||
412 | static void __init overo_init_irq(void) | 412 | static void __init overo_init_early(void) |
413 | { | 413 | { |
414 | omap_board_config = overo_config; | 414 | omap_board_config = overo_config; |
415 | omap_board_config_size = ARRAY_SIZE(overo_config); | 415 | omap_board_config_size = ARRAY_SIZE(overo_config); |
416 | omap2_init_common_infrastructure(); | 416 | omap2_init_common_infrastructure(); |
417 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, | 417 | omap2_init_common_devices(mt46h32m32lf6_sdrc_params, |
418 | mt46h32m32lf6_sdrc_params); | 418 | mt46h32m32lf6_sdrc_params); |
419 | omap_init_irq(); | ||
420 | } | 419 | } |
421 | 420 | ||
422 | static struct platform_device *overo_devices[] __initdata = { | 421 | static struct platform_device *overo_devices[] __initdata = { |
@@ -501,9 +500,10 @@ static void __init overo_init(void) | |||
501 | 500 | ||
502 | MACHINE_START(OVERO, "Gumstix Overo") | 501 | MACHINE_START(OVERO, "Gumstix Overo") |
503 | .boot_params = 0x80000100, | 502 | .boot_params = 0x80000100, |
504 | .map_io = omap3_map_io, | ||
505 | .reserve = omap_reserve, | 503 | .reserve = omap_reserve, |
506 | .init_irq = overo_init_irq, | 504 | .map_io = omap3_map_io, |
505 | .init_early = overo_init_early, | ||
506 | .init_irq = omap_init_irq, | ||
507 | .init_machine = overo_init, | 507 | .init_machine = overo_init, |
508 | .timer = &omap_timer, | 508 | .timer = &omap_timer, |
509 | MACHINE_END | 509 | MACHINE_END |