summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/proc_comm.c
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2010-01-29 20:43:42 +0100
committerDaniel Walker <dwalker@codeaurora.org>2010-05-12 18:15:35 +0200
commitb42dc44afca902d19f86d541cbb665f31b9149a0 (patch)
tree9660001ed178bfa9dc52a5138b312f02a664cd33 /arch/arm/mach-msm/proc_comm.c
parentmsm: smd: provide atomic channel writes (diff)
downloadlinux-b42dc44afca902d19f86d541cbb665f31b9149a0.tar.xz
linux-b42dc44afca902d19f86d541cbb665f31b9149a0.zip
arm: msm: correctly signal the apps-to-modem irq in smd/proc_comm
Signed-off-by: Dima Zavin <dima@android.com> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/proc_comm.c')
-rw-r--r--arch/arm/mach-msm/proc_comm.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/proc_comm.c b/arch/arm/mach-msm/proc_comm.c
index 915ee704ed3c..1cbdebf57c37 100644
--- a/arch/arm/mach-msm/proc_comm.c
+++ b/arch/arm/mach-msm/proc_comm.c
@@ -23,11 +23,18 @@
#include "proc_comm.h"
-#define MSM_A2M_INT(n) (MSM_CSR_BASE + 0x400 + (n) * 4)
+static inline void msm_a2m_int(uint32_t irq)
+{
+#if defined(CONFIG_ARCH_MSM7X30)
+ writel(1 << irq, MSM_GCC_BASE + 0x8);
+#else
+ writel(1, MSM_CSR_BASE + 0x400 + (irq * 4));
+#endif
+}
static inline void notify_other_proc_comm(void)
{
- writel(1, MSM_A2M_INT(6));
+ msm_a2m_int(6);
}
#define APP_COMMAND 0x00