diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-h4.c')
-rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 25cc9dad4b02..f6a3872f72fa 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
@@ -290,12 +290,16 @@ static struct omap_board_config_kernel h4_config[] __initdata = { | |||
290 | { OMAP_TAG_LCD, &h4_lcd_config }, | 290 | { OMAP_TAG_LCD, &h4_lcd_config }, |
291 | }; | 291 | }; |
292 | 292 | ||
293 | static void __init omap_h4_init_irq(void) | 293 | static void __init omap_h4_init_early(void) |
294 | { | 294 | { |
295 | omap_board_config = h4_config; | 295 | omap_board_config = h4_config; |
296 | omap_board_config_size = ARRAY_SIZE(h4_config); | 296 | omap_board_config_size = ARRAY_SIZE(h4_config); |
297 | omap2_init_common_infrastructure(); | 297 | omap2_init_common_infrastructure(); |
298 | omap2_init_common_devices(NULL, NULL); | 298 | omap2_init_common_devices(NULL, NULL); |
299 | } | ||
300 | |||
301 | static void __init omap_h4_init_irq(void) | ||
302 | { | ||
299 | omap_init_irq(); | 303 | omap_init_irq(); |
300 | h4_init_flash(); | 304 | h4_init_flash(); |
301 | } | 305 | } |
@@ -378,8 +382,9 @@ static void __init omap_h4_map_io(void) | |||
378 | MACHINE_START(OMAP_H4, "OMAP2420 H4 board") | 382 | MACHINE_START(OMAP_H4, "OMAP2420 H4 board") |
379 | /* Maintainer: Paul Mundt <paul.mundt@nokia.com> */ | 383 | /* Maintainer: Paul Mundt <paul.mundt@nokia.com> */ |
380 | .boot_params = 0x80000100, | 384 | .boot_params = 0x80000100, |
381 | .map_io = omap_h4_map_io, | ||
382 | .reserve = omap_reserve, | 385 | .reserve = omap_reserve, |
386 | .map_io = omap_h4_map_io, | ||
387 | .init_early = omap_h4_init_early, | ||
383 | .init_irq = omap_h4_init_irq, | 388 | .init_irq = omap_h4_init_irq, |
384 | .init_machine = omap_h4_init, | 389 | .init_machine = omap_h4_init, |
385 | .timer = &omap_timer, | 390 | .timer = &omap_timer, |