diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-08-22 23:57:23 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-08-24 04:48:10 -0700 |
| commit | a4ca9dbe44a167d63545c7ac2b5a36d7b0b415b6 (patch) | |
| tree | d035c4251bdd45aff89e9e6c72ba644ec679f7b7 /arch/arm/mach-omap2/board-zoom.c | |
| parent | f41caddbe73f52a42f529d668ce47b4d693fd2c0 (diff) | |
| download | op-kernel-dev-a4ca9dbe44a167d63545c7ac2b5a36d7b0b415b6.zip op-kernel-dev-a4ca9dbe44a167d63545c7ac2b5a36d7b0b415b6.tar.gz | |
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-zoom.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index 8a98c3c..5695264 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c @@ -37,12 +37,6 @@ static void __init omap_zoom_init_early(void) { omap2_init_common_infrastructure(); - if (machine_is_omap_zoom2()) - omap2_init_common_devices(mt46h32m32lf6_sdrc_params, - mt46h32m32lf6_sdrc_params); - else if (machine_is_omap_zoom3()) - omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params, - h8mbx00u0mer0em_sdrc_params); } #ifdef CONFIG_OMAP_MUX @@ -129,6 +123,14 @@ static void __init omap_zoom_init(void) ZOOM_NAND_CS, NAND_BUSWIDTH_16); zoom_debugboard_init(); zoom_peripherals_init(); + + if (machine_is_omap_zoom2()) + omap_sdrc_init(mt46h32m32lf6_sdrc_params, + mt46h32m32lf6_sdrc_params); + else if (machine_is_omap_zoom3()) + omap_sdrc_init(h8mbx00u0mer0em_sdrc_params, + h8mbx00u0mer0em_sdrc_params); + zoom_display_init(); } |
