diff options
author | Tony Lindgren <tony@atomide.com> | 2011-08-23 02:57:23 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-08-24 07:48:10 -0400 |
commit | a4ca9dbe44a167d63545c7ac2b5a36d7b0b415b6 (patch) | |
tree | d035c4251bdd45aff89e9e6c72ba644ec679f7b7 /arch/arm/mach-omap2/board-h4.c | |
parent | f41caddbe73f52a42f529d668ce47b4d693fd2c0 (diff) |
ARM: OMAP: Move omap2_init_common_devices out of init_early
There's no need to call omap2_init_common_devices from init_early.
It no longer does anything else except reprogram the memory timings
for some boards, so it's better to do it later so we have a chance
to get console messages if something goes wrong.
Move it to happen after omap_serial_init gets called. And while
patching it anyways, rename it to omap_sdrc_init as suggested by
Benoit Cousson <b-cousson@ti.com>.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 45de2b319ec..84ca5c02d32 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
@@ -293,7 +293,6 @@ static struct omap_board_config_kernel h4_config[] __initdata = { | |||
293 | static void __init omap_h4_init_early(void) | 293 | static void __init omap_h4_init_early(void) |
294 | { | 294 | { |
295 | omap2_init_common_infrastructure(); | 295 | omap2_init_common_infrastructure(); |
296 | omap2_init_common_devices(NULL, NULL); | ||
297 | } | 296 | } |
298 | 297 | ||
299 | static void __init omap_h4_init_irq(void) | 298 | static void __init omap_h4_init_irq(void) |
@@ -371,6 +370,7 @@ static void __init omap_h4_init(void) | |||
371 | platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices)); | 370 | platform_add_devices(h4_devices, ARRAY_SIZE(h4_devices)); |
372 | omap2_usbfs_init(&h4_usb_config); | 371 | omap2_usbfs_init(&h4_usb_config); |
373 | omap_serial_init(); | 372 | omap_serial_init(); |
373 | omap_sdrc_init(NULL, NULL); | ||
374 | h4_init_flash(); | 374 | h4_init_flash(); |
375 | } | 375 | } |
376 | 376 | ||