commit d19bf44f6b107301acc929ddb1a24d54c106aa3b
author Jeff Ohlstein <johlstei@codeaurora.org> Fri Sep 09 12:48:18 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Tue Oct 04 17:13:35 2011 -0700
tree f0beee59688efd454557e2a31008531720aa9581
parent cf41e61d4f3dfef21a2b3d8da198c218378225ba

msm: dma: add support for 9615 dma

Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>

Conflicts:

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

arch/arm/mach-msm/include/mach/dma.h

diff --git a/arch/arm/mach-msm/include/mach/dma.h b/arch/arm/mach-msm/include/mach/dma.h
index 144a71c..9c331a4 100644
--- a/arch/arm/mach-msm/include/mach/dma.h
+++ b/arch/arm/mach-msm/include/mach/dma.h
@@ -55,7 +55,7 @@
 #if defined(CONFIG_ARCH_MSM7X30)
 #define DMOV_SD_SIZE 0x400
 #define DMOV_SD_AARM 2
-#elif defined(CONFIG_ARCH_MSM8960)
+#elif defined(CONFIG_ARCH_MSM8960) || defined(CONFIG_ARCH_MSM9615)
 #define DMOV_SD_SIZE 0x800
 #define DMOV_SD_AARM 1
 #elif defined(CONFIG_ARCH_APQ8064)
@@ -205,6 +205,20 @@
 #define DMOV_HSUART_GSBI6_RX_CHAN	8
 #define DMOV_HSUART_GSBI6_RX_CRCI	11
 
+#elif defined(CONFIG_ARCH_MSM9615)
+
+#define DMOV_GP_CHAN          4
+
+#define DMOV_CE_IN_CHAN       0
+#define DMOV_CE_IN_CRCI       12
+
+#define DMOV_CE_OUT_CHAN      1
+#define DMOV_CE_OUT_CRCI      13
+
+#define DMOV_NAND_CHAN        3
+#define DMOV_NAND_CRCI_CMD    15
+#define DMOV_NAND_CRCI_DATA   3
+
 #elif defined(CONFIG_ARCH_FSM9XXX)
 /* defined in dma-fsm9xxx.h */