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/board-fsm9xxx.c b/arch/arm/mach-msm/board-fsm9xxx.c
index 57eea51..5244434 100644
--- a/arch/arm/mach-msm/board-fsm9xxx.c
+++ b/arch/arm/mach-msm/board-fsm9xxx.c
@@ -869,10 +869,6 @@
static void __init fsm9xxx_init(void)
{
- if (socinfo_init() < 0)
- pr_err("%s: socinfo_init() failed!\n",
- __func__);
-
acpuclk_init(&acpuclk_9xxx_soc_data);
regulator_has_full_constraints();
@@ -903,6 +899,10 @@
msm_shared_ram_phys = 0x00100000;
msm_map_fsm9xxx_io();
msm_clock_init(&fsm9xxx_clock_init_data);
+ if (socinfo_init() < 0)
+ pr_err("%s: socinfo_init() failed!\n",
+ __func__);
+
}
MACHINE_START(FSM9XXX_SURF, "QCT FSM9XXX")