commit 56b933a8c8b185a0bce016518e5a8ef6d95b2e96
author Jeff Hugo <jhugo@codeaurora.org> Wed Sep 28 14:42:05 2011 -0600
committer Bryan Huntsman <bryanh@codeaurora.org> Tue Oct 04 17:13:53 2011 -0700
tree eae9ff671ea1ea35ccf8c7643bbc534beb69b918
parent 0c55b7441513c935fec0a82cebcd408fe33b70bf

msm: smd: add support for 9615

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

Conflicts:

	arch/arm/mach-msm/board-9615.c
	arch/arm/mach-msm/devices-9615.c

arch/arm/mach-msm/smd.c

diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
index 1b68560..3db19b6 100644
--- a/arch/arm/mach-msm/smd.c
+++ b/arch/arm/mach-msm/smd.c
@@ -42,7 +42,8 @@
 #include "modem_notifier.h"
 
 #if defined(CONFIG_ARCH_QSD8X50) || defined(CONFIG_ARCH_MSM8X60) \
-	|| defined(CONFIG_ARCH_MSM8960) || defined(CONFIG_ARCH_FSM9XXX)
+	|| defined(CONFIG_ARCH_MSM8960) || defined(CONFIG_ARCH_FSM9XXX) \
+	|| defined(CONFIG_ARCH_MSM9615)
 #define CONFIG_QDSP6 1
 #endif
 
@@ -186,6 +187,19 @@
 			(smd_write_intr(1 << 25, MSM_APCS_GCC_BASE + 0x8))
 #define MSM_TRIG_A2WCNSS_SMSM_INT  \
 			(smd_write_intr(1 << 23, MSM_APCS_GCC_BASE + 0x8))
+#elif defined(CONFIG_ARCH_MSM9615)
+#define MSM_TRIG_A2M_SMD_INT     \
+			(smd_write_intr(1 << 3, MSM_APCS_GCC_BASE + 0x8))
+#define MSM_TRIG_A2Q6_SMD_INT    \
+			(smd_write_intr(1 << 15, MSM_APCS_GCC_BASE + 0x8))
+#define MSM_TRIG_A2M_SMSM_INT    \
+			(smd_write_intr(1 << 4, MSM_APCS_GCC_BASE + 0x8))
+#define MSM_TRIG_A2Q6_SMSM_INT   \
+			(smd_write_intr(1 << 14, MSM_APCS_GCC_BASE + 0x8))
+#define MSM_TRIG_A2DSPS_SMD_INT
+#define MSM_TRIG_A2DSPS_SMSM_INT
+#define MSM_TRIG_A2WCNSS_SMD_INT
+#define MSM_TRIG_A2WCNSS_SMSM_INT
 #elif defined(CONFIG_ARCH_FSM9XXX)
 #define MSM_TRIG_A2Q6_SMD_INT	\
 			(smd_write_intr(1 << 10, MSM_GCC_BASE + 0x8))