summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-01-02 15:18:53 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-01-02 15:18:53 +0300
commitbc6447b8e4fdb3306ee6381df9650a1a8aa57c5b (patch)
tree0ba38bb6883a561bcd2febbc8e5090fc559d2de6 /arch/arm/include
parent5369bea7d7db1d95f63907f3470e23d32930be98 (diff)
downloadlinux-bc6447b8e4fdb3306ee6381df9650a1a8aa57c5b.tar.xz
[ARM] dma: make DMA_MODE_xxx reflect ISA DMA settings
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/dma.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index c5557a650d1d..59f59c6c79f7 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -26,12 +26,15 @@
*/
typedef unsigned int dmamode_t;
-#define DMA_MODE_MASK 3
+/*
+ * The DMA modes reflect the settings for the ISA DMA controller
+ */
+#define DMA_MODE_MASK 0xcc
-#define DMA_MODE_READ 0
-#define DMA_MODE_WRITE 1
-#define DMA_MODE_CASCADE 2
-#define DMA_AUTOINIT 4
+#define DMA_MODE_READ 0x44
+#define DMA_MODE_WRITE 0x48
+#define DMA_MODE_CASCADE 0xc0
+#define DMA_AUTOINIT 0x10
extern spinlock_t dma_spin_lock;