msm: 8960: Remove pre-silicon support
Support for RUMI and simulation are no longer required.
Change-Id: I49cdbc463a8484d18696eceae9a2a2d7aa9b2b85
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
diff --git a/arch/arm/mach-msm/socinfo.c b/arch/arm/mach-msm/socinfo.c
index f3b5720..bea567b 100644
--- a/arch/arm/mach-msm/socinfo.c
+++ b/arch/arm/mach-msm/socinfo.c
@@ -628,8 +628,7 @@
static void * __init setup_dummy_socinfo(void)
{
- if (machine_is_msm8960_rumi3() || machine_is_msm8960_sim() ||
- machine_is_msm8960_cdp())
+ if (machine_is_msm8960_cdp())
dummy_socinfo.id = 87;
else if (machine_is_apq8064_rumi3() || machine_is_apq8064_sim())
dummy_socinfo.id = 109;
@@ -758,7 +757,6 @@
return 1;
if (read_cpuid_mpidr() & BIT(30) &&
- !machine_is_msm8960_sim() &&
!machine_is_apq8064_sim())
return 1;
@@ -768,9 +766,6 @@
const int read_msm_cpu_type(void)
{
- if (machine_is_msm8960_sim() || machine_is_msm8960_rumi3())
- return MSM_CPU_8960;
-
if (socinfo_get_msm_cpu() != MSM_CPU_UNKNOWN)
return socinfo_get_msm_cpu();