From e445fe335b90aebcdeed9e0a0b4333ab55af7ced Mon Sep 17 00:00:00 2001
From: Stepan Moskovchenko <stepanm@codeaurora.org>
Date: Fri, 6 Jul 2012 16:57:34 -0700
Subject: [PATCH] msm: socinfo: Add support for MSM8930AA

Add the SoC ID and cpu_is wrapper for identifying the
MSM8930AA SoC.

Change-Id: I7d2344c1903afb6830ef2362c200a91f72845d25
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
---
 arch/arm/mach-msm/include/mach/socinfo.h | 10 ++++++++++
 arch/arm/mach-msm/socinfo.c              |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/arch/arm/mach-msm/include/mach/socinfo.h b/arch/arm/mach-msm/include/mach/socinfo.h
index 6b4ce2ae556..15aebcdda5b 100644
--- a/arch/arm/mach-msm/include/mach/socinfo.h
+++ b/arch/arm/mach-msm/include/mach/socinfo.h
@@ -73,6 +73,7 @@ enum msm_cpu {
 	MSM_CPU_7X25AB,
 	MSM_CPU_8064,
 	MSM_CPU_8930,
+	MSM_CPU_8930AA,
 	MSM_CPU_7X27AA,
 	MSM_CPU_9615,
 	MSM_CPU_8974,
@@ -262,6 +263,15 @@ static inline int cpu_is_msm8930(void)
 #endif
 }
 
+static inline int cpu_is_msm8930aa(void)
+{
+#ifdef CONFIG_ARCH_MSM8930
+	return read_msm_cpu_type() == MSM_CPU_8930AA;
+#else
+	return 0;
+#endif
+}
+
 static inline int cpu_is_msm8627(void)
 {
 /* 8930 and 8627 will share the same CONFIG_ARCH type unless otherwise needed */
diff --git a/arch/arm/mach-msm/socinfo.c b/arch/arm/mach-msm/socinfo.c
index c37943c4029..08af4d4257c 100644
--- a/arch/arm/mach-msm/socinfo.c
+++ b/arch/arm/mach-msm/socinfo.c
@@ -259,6 +259,9 @@ static enum msm_cpu cpu_of_id[] = {
 	/* 9625 IDs */
 	[134] = MSM_CPU_9625,
 
+	/* 8930AA ID */
+	[142] = MSM_CPU_8930AA,
+
 	/* Uninitialized IDs are not known to run Linux.
 	   MSM_CPU_UNKNOWN is set to 0 to ensure these IDs are
 	   considered as unknown CPU. */