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/io.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/io.c')
-rw-r--r-- | arch/arm/mach-omap2/io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 2ce1ce6fb4db..9258a5c7f735 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -376,7 +376,7 @@ void __init omap2_init_common_infrastructure(void) | |||
376 | * omap_hwmod_late_init(), so boards that desire full watchdog | 376 | * omap_hwmod_late_init(), so boards that desire full watchdog |
377 | * coverage of kernel initialization can reprogram the | 377 | * coverage of kernel initialization can reprogram the |
378 | * postsetup_state between the calls to | 378 | * postsetup_state between the calls to |
379 | * omap2_init_common_infra() and omap2_init_common_devices(). | 379 | * omap2_init_common_infra() and omap_sdrc_init(). |
380 | * | 380 | * |
381 | * XXX ideally we could detect whether the MPU WDT was currently | 381 | * XXX ideally we could detect whether the MPU WDT was currently |
382 | * enabled here and make this conditional | 382 | * enabled here and make this conditional |
@@ -400,7 +400,7 @@ void __init omap2_init_common_infrastructure(void) | |||
400 | pr_err("Could not init clock framework - unknown SoC\n"); | 400 | pr_err("Could not init clock framework - unknown SoC\n"); |
401 | } | 401 | } |
402 | 402 | ||
403 | void __init omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0, | 403 | void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, |
404 | struct omap_sdrc_params *sdrc_cs1) | 404 | struct omap_sdrc_params *sdrc_cs1) |
405 | { | 405 | { |
406 | if (cpu_is_omap24xx() || omap3_has_sdrc()) { | 406 | if (cpu_is_omap24xx() || omap3_has_sdrc()) { |