socinfo: initialize socinfo in map_io
Having socinfo earlier allows the cpu_is functions to be used by the
timer driver, which helps in allowing multitarget compilation.
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
Conflicts:
arch/arm/mach-msm/board-qrdc.c
arch/arm/mach-msm/board-qt8660.c
diff --git a/arch/arm/mach-msm/devices-9615.c b/arch/arm/mach-msm/devices-9615.c
index c934558..e25b1f0 100644
--- a/arch/arm/mach-msm/devices-9615.c
+++ b/arch/arm/mach-msm/devices-9615.c
@@ -391,9 +391,6 @@
void __init msm9615_device_init(void)
{
- if (socinfo_init() < 0)
- pr_err("socinfo_init() failed!\n");
-
msm_clock_init(&msm9615_clock_init_data);
acpuclk_init(&acpuclk_9615_soc_data);
}
@@ -404,6 +401,8 @@
msm_shared_ram_phys = MSM_SHARED_RAM_PHYS;
msm_map_msm9615_io();
l2x0_cache_init();
+ if (socinfo_init() < 0)
+ pr_err("socinfo_init() failed!\n");
}
void __init msm9615_init_irq(void)