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-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index 108a532..ee9df6f 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -6938,10 +6938,6 @@
GPIO_CFG_2MA);
uint32_t soc_version = 0;
- if (socinfo_init() < 0)
- printk(KERN_ERR "%s: socinfo_init() failed!\n",
- __func__);
-
soc_version = socinfo_get_version();
msm_clock_init(&msm7x30_clock_init_data);
@@ -7212,6 +7208,9 @@
{
msm_shared_ram_phys = 0x00100000;
msm_map_msm7x30_io();
+ if (socinfo_init() < 0)
+ printk(KERN_ERR "%s: socinfo_init() failed!\n",
+ __func__);
}
static void __init msm7x30_init_early(void)