diff options
author | Tony Lindgren <tony@atomide.com> | 2011-02-24 17:36:03 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-02-25 13:19:21 -0500 |
commit | e41cccfe794d188b0ae7f17f01692bcbc0e0dc87 (patch) | |
tree | c4c38c9738f582f93e66839ccb25347c6dadbf27 /arch/arm/mach-omap2/board-h4.c | |
parent | e0530460f6bc268b446040f1973d427d21f042d9 (diff) |
omap2+: Minimize board specific init_early calls
We should only call init_common_infrastructure and
init_common_devices from init_early.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-h4.c')
-rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index f6a3872f72f..7e6bf4fa153 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
@@ -292,8 +292,6 @@ static struct omap_board_config_kernel h4_config[] __initdata = { | |||
292 | 292 | ||
293 | static void __init omap_h4_init_early(void) | 293 | static void __init omap_h4_init_early(void) |
294 | { | 294 | { |
295 | omap_board_config = h4_config; | ||
296 | omap_board_config_size = ARRAY_SIZE(h4_config); | ||
297 | omap2_init_common_infrastructure(); | 295 | omap2_init_common_infrastructure(); |
298 | omap2_init_common_devices(NULL, NULL); | 296 | omap2_init_common_devices(NULL, NULL); |
299 | } | 297 | } |
@@ -334,6 +332,9 @@ static void __init omap_h4_init(void) | |||
334 | { | 332 | { |
335 | omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAF); | 333 | omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAF); |
336 | 334 | ||
335 | omap_board_config = h4_config; | ||
336 | omap_board_config_size = ARRAY_SIZE(h4_config); | ||
337 | |||
337 | /* | 338 | /* |
338 | * Make sure the serial ports are muxed on at this point. | 339 | * Make sure the serial ports are muxed on at this point. |
339 | * You have to mux them off in device drivers later on | 340 | * You have to mux them off in device drivers later on |