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-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index 43dafb0..97f1d3a 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -2324,6 +2324,9 @@
{
msm_shared_ram_phys = MSM_SHARED_RAM_PHYS;
msm_map_msm8960_io();
+
+ if (socinfo_init() < 0)
+ pr_err("socinfo_init() failed!\n");
}
static void __init msm8960_init_irq(void)
@@ -4083,9 +4086,6 @@
static void __init msm8960_sim_init(void)
{
- if (socinfo_init() < 0)
- pr_err("socinfo_init() failed!\n");
-
BUG_ON(msm_rpm_init(&msm_rpm_data));
BUG_ON(msm_rpmrs_levels_init(msm_rpmrs_levels,
ARRAY_SIZE(msm_rpmrs_levels)));
@@ -4129,9 +4129,6 @@
static void __init msm8960_rumi3_init(void)
{
- if (socinfo_init() < 0)
- pr_err("socinfo_init() failed!\n");
-
BUG_ON(msm_rpm_init(&msm_rpm_data));
BUG_ON(msm_rpmrs_levels_init(msm_rpmrs_levels,
ARRAY_SIZE(msm_rpmrs_levels)));
@@ -4165,9 +4162,6 @@
static void __init msm8960_cdp_init(void)
{
- if (socinfo_init() < 0)
- pr_err("socinfo_init() failed!\n");
-
if (meminfo_init(SYS_MEMORY, SZ_256M) < 0)
pr_err("meminfo_init() failed!\n");