msm: socinfo: Rename 8x30 to 8930
Use a SoC name that is more consistent with the others.
Change-Id: I94042c45980d1bb8e1693e01a2ff9abf5bba8d2e
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
diff --git a/arch/arm/mach-msm/include/mach/socinfo.h b/arch/arm/mach-msm/include/mach/socinfo.h
index dbfbad2..c8867bd 100644
--- a/arch/arm/mach-msm/include/mach/socinfo.h
+++ b/arch/arm/mach-msm/include/mach/socinfo.h
@@ -44,7 +44,7 @@
MSM_CPU_7X25A,
MSM_CPU_7X25AA,
MSM_CPU_8064,
- MSM_CPU_8X30,
+ MSM_CPU_8930,
MSM_CPU_7X27AA,
MSM_CPU_9615,
};
@@ -208,9 +208,9 @@
#endif
}
-static inline int cpu_is_msm8x30(void)
+static inline int cpu_is_msm8930(void)
{
- return read_msm_cpu_type() == MSM_CPU_8X30;
+ return read_msm_cpu_type() == MSM_CPU_8930;
}
static inline int cpu_is_fsm9xxx(void)
diff --git a/arch/arm/mach-msm/socinfo.c b/arch/arm/mach-msm/socinfo.c
index 33cfccc..45653a2 100644
--- a/arch/arm/mach-msm/socinfo.c
+++ b/arch/arm/mach-msm/socinfo.c
@@ -718,7 +718,7 @@
if (get_core_count() == 2)
return MSM_CPU_8960;
else
- return MSM_CPU_8X30;
+ return MSM_CPU_8930;
case 0x510F06F0:
return MSM_CPU_8064;
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 21aa501..a0602f0 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -996,7 +996,7 @@
else if (cpu_is_msm8x60()) {
dgt->freq = 6750000;
__raw_writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);
- } else if (cpu_is_msm8960() || cpu_is_apq8064() || cpu_is_msm8x30()
+ } else if (cpu_is_msm8960() || cpu_is_apq8064() || cpu_is_msm8930()
|| cpu_is_msm9615()) {
dgt->freq = 6750000;
__raw_writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);