Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux...

[linux-2.6-omap-h63xx.git] / include / asm-sh / cpu-sh4 / dma.h

diff --git a/include/asm-sh/cpu-sh4/dma.h b/include/asm-sh/cpu-sh4/dma.h
index 3e4b3e6d80c02fb81b8e03dd882eb10c11ca99ab..aaf71b018c281399ade954200171fc60400c8f33 100644 (file)
--- a/include/asm-sh/cpu-sh4/dma.h
+++ b/include/asm-sh/cpu-sh4/dma.h
@@ -3,6 +3,17 @@
 
 #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
 
@@ -20,7 +31,7 @@
 #define TS_32          0x00000030
 #define TS_64          0x00000000
 
-#define CHCR_TS_MASK   0x30
+#define CHCR_TS_MASK   0x70
 #define CHCR_TS_SHIFT  4
 
 #define DMAOR_COD      0x00000008
@@ -42,7 +53,7 @@ enum {
 /*
  * The DMA count is defined as the number of bytes to transfer.
  */
-static unsigned int ts_shift[] __attribute__ ((used)) = {
+static unsigned int ts_shift[] __maybe_unused = {
        [XMIT_SZ_64BIT]         = 3,
        [XMIT_SZ_8BIT]          = 0,
        [XMIT_SZ_16BIT]         = 1,