aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/io.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-02-14 18:40:20 -0500
committerTony Lindgren <tony@atomide.com>2011-02-14 18:40:49 -0500
commit3e16f92536334ccb464ed88cf4d8cc0dd43da106 (patch)
tree0ad6d2c96672cae89d339d0305e8001cde2833c7 /arch/arm/mach-omap2/io.c
parent44dc046e93eb98d41048954f700b1927f7e288ed (diff)
omap2+: Fix omap_serial_early_init to work with init_early hook
The new init_early hook happens at the end of setup_arch, which is too early for kzalloc. However, there's no need to call omap_serial_early_init that early, so fix this by setting it up as a core_initcall. Signed-off-by: Tony Lindgren <tony@atomide.com> Tested-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r--arch/arm/mach-omap2/io.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index f89173ab4abe..26a61cf27291 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -398,8 +398,6 @@ void __init omap2_init_common_infrastructure(void)
398void __init omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0, 398void __init omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0,
399 struct omap_sdrc_params *sdrc_cs1) 399 struct omap_sdrc_params *sdrc_cs1)
400{ 400{
401 omap_serial_early_init();
402
403 if (cpu_is_omap24xx() || cpu_is_omap34xx()) { 401 if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
404 omap2_sdrc_init(sdrc_cs0, sdrc_cs1); 402 omap2_sdrc_init(sdrc_cs0, sdrc_cs1);
405 _omap2_init_reprogram_sdrc(); 403 _omap2_init_reprogram_sdrc();