Merge branch 'linus' into core/futexes

[sfrench/cifs-2.6.git] / arch / sh / include / cpu-sh4 / cpu / dma.h

diff --git a/arch/sh/include/cpu-sh4/cpu/dma.h b/arch/sh/include/cpu-sh4/cpu/dma.h
index 235b7cd1fc9a72eb7757d2f977ff0e06aa122fb5..bcb30246e85c9fce6c85593736884eac76242bcf 100644 (file)
--- a/arch/sh/include/cpu-sh4/cpu/dma.h
+++ b/arch/sh/include/cpu-sh4/cpu/dma.h
@@ -1,31 +1,29 @@
 #ifndef __ASM_CPU_SH4_DMA_H
 #define __ASM_CPU_SH4_DMA_H
 
-#define DMAOR_INIT     ( 0x8000 | DMAOR_DME )
-
 /* SH7751/7760/7780 DMA IRQ sources */
-#define DMTE0_IRQ      34
-#define DMTE1_IRQ      35
-#define DMTE2_IRQ      36
-#define DMTE3_IRQ      37
-#define DMTE4_IRQ      44
-#define DMTE5_IRQ      45
-#define DMTE6_IRQ      46
-#define DMTE7_IRQ      47
-#define DMAE_IRQ       38
 
 #ifdef CONFIG_CPU_SH4A
-#define SH_DMAC_BASE   0xfc808020
 
+#define DMAOR_INIT     (DMAOR_DME)
 #define CHCR_TS_MASK   0x18
 #define CHCR_TS_SHIFT  3
 
-#include <cpu/dma-sh7780.h>
-#else
-#define SH_DMAC_BASE   0xffa00000
+#include <cpu/dma-sh4a.h>
+#else /* CONFIG_CPU_SH4A */
+/*
+ * SH7750/SH7751/SH7760
+ */
+#define DMTE0_IRQ      34
+#define DMTE4_IRQ      44
+#define DMTE6_IRQ      46
+#define DMAE0_IRQ      38
 
+#define DMAOR_INIT     (0x8000|DMAOR_DME)
+#define SH_DMAC_BASE0  0xffa00000
+#define SH_DMAC_BASE1  0xffa00070
 /* Definitions for the SuperH DMAC */
-#define TM_BURST       0x0000080
+#define TM_BURST       0x00000080
 #define TS_8           0x00000010
 #define TS_16          0x00000020
 #define TS_32          0x00000030