commit afb8c4a9b88e8792d8915f69c236ee07b86e7220
author Jeff Hugo <jhugo@codeaurora.org> Thu Oct 27 15:57:27 2011 -0600
committer Jeff Hugo <jhugo@codeaurora.org> Mon Oct 31 11:54:14 2011 -0600
tree 10d3bf3a8834a254e5ba544a73b0520eba5ef3eb
parent 6f6fdc65bfe8c38b6d905903de911eaed2a74e18

msm: smd: restrict the 8960 GPIO40 workaround to just v1 hardware

Change-Id: I6e5db43f9d70377e926e80933f89d406ba95c2aa
Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org>

arch/arm/mach-msm/smd.c

diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
index 9b7dd45..d61bba2 100644
--- a/arch/arm/mach-msm/smd.c
+++ b/arch/arm/mach-msm/smd.c
@@ -277,8 +277,10 @@
 	 * trigger GPIO 40 to wake up RIVA from power collaspe
 	 * not to be sent to customers
 	 */
-	__raw_writel(0x0, MSM_TLMM_BASE + 0x1284);
-	__raw_writel(0x2, MSM_TLMM_BASE + 0x1284);
+	if (SOCINFO_VERSION_MAJOR(socinfo_get_version()) == 1) {
+		__raw_writel(0x0, MSM_TLMM_BASE + 0x1284);
+		__raw_writel(0x2, MSM_TLMM_BASE + 0x1284);
+	}
 	/* end workaround */
 }
 #else