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-msm7x27a.c b/arch/arm/mach-msm/devices-msm7x27a.c
index 4085040..ef187a6 100644
--- a/arch/arm/mach-msm/devices-msm7x27a.c
+++ b/arch/arm/mach-msm/devices-msm7x27a.c
@@ -697,9 +697,6 @@
int __init msm7x2x_misc_init(void)
{
- if (socinfo_init() < 0)
- pr_err("%s: socinfo_init() failed!\n", __func__);
-
msm_clock_init(&msm7x27a_clock_init_data);
if (cpu_is_msm7x27aa())
acpuclk_init(&acpuclk_7x27aa_soc_data);
@@ -732,6 +729,9 @@
{
msm_map_common_io();
msm7x27x_cache_init();
+ if (socinfo_init() < 0)
+ pr_err("%s: socinfo_init() failed!\n", __func__);
+
}
struct platform_device *msm_footswitch_devices[] = {