---

yaml --- r: 16745 b: refs/heads/master c: d4c6fc9 h: refs/heads/master i: 16743: 7ef5083 v: v3
git-mirror · Jan 4, 2006 · afbf3d6 · afbf3d6
1 parent c18f267
commit afbf3d6
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 32 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6842b9299272a9471a7e94e046b953f6ffe3db9d
+refs/heads/master: d4c6fc9976dd70a27abc988ddbd6a746c1dba0a7
diff --git a/trunk/include/asm-arm/arch-aaec2000/dma.h b/trunk/include/asm-arm/arch-aaec2000/dma.h
@@ -11,7 +11,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS         0xffffffff
 #define MAX_DMA_CHANNELS        0
 
 #endif
diff --git a/trunk/include/asm-arm/arch-clps711x/dma.h b/trunk/include/asm-arm/arch-clps711x/dma.h
@@ -20,8 +20,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS		0xffffffff
-
 #define MAX_DMA_CHANNELS	0
 
 #endif /* _ASM_ARCH_DMA_H */

diff --git a/trunk/include/asm-arm/arch-ebsa110/dma.h b/trunk/include/asm-arm/arch-ebsa110/dma.h
@@ -12,7 +12,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS		0xffffffff
 #define MAX_DMA_CHANNELS	0
 
 #endif /* _ASM_ARCH_DMA_H */

diff --git a/trunk/include/asm-arm/arch-ebsa285/dma.h b/trunk/include/asm-arm/arch-ebsa285/dma.h
@@ -9,11 +9,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-/*
- * This is the maximum DMA address that can be DMAd to.
- */
-#define MAX_DMA_ADDRESS		0xffffffff
-
 /*
  * The 21285 has two internal DMA channels; we call these 8 and 9.
  * On CATS hardware we have an additional eight ISA dma channels

diff --git a/trunk/include/asm-arm/arch-epxa10db/dma.h b/trunk/include/asm-arm/arch-epxa10db/dma.h
@@ -20,8 +20,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS		0xffffffff
-
 #define MAX_DMA_CHANNELS	0
 
 #endif /* _ASM_ARCH_DMA_H */

diff --git a/trunk/include/asm-arm/arch-imx/dma.h b/trunk/include/asm-arm/arch-imx/dma.h
@@ -20,8 +20,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS		0xffffffff
-
 #define MAX_DMA_CHANNELS	0
 
 /*

diff --git a/trunk/include/asm-arm/arch-integrator/dma.h b/trunk/include/asm-arm/arch-integrator/dma.h
@@ -20,8 +20,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS		0xffffffff
-
 #define MAX_DMA_CHANNELS	0
 
 #endif /* _ASM_ARCH_DMA_H */

diff --git a/trunk/include/asm-arm/arch-iop3xx/dma.h b/trunk/include/asm-arm/arch-iop3xx/dma.h
@@ -11,6 +11,4 @@
 #ifndef _IOP3XX_DMA_H_P
 #define _IOP3XX_DMA_H_P
 
-#define MAX_DMA_ADDRESS		0xffffffff
-
 #endif /* _ASM_ARCH_DMA_H_P */
diff --git a/trunk/include/asm-arm/arch-ixp2000/dma.h b/trunk/include/asm-arm/arch-ixp2000/dma.h
@@ -10,8 +10,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS		0xffffffff
-
 /* No DMA */
 #define MAX_DMA_CHANNELS	0
 

diff --git a/trunk/include/asm-arm/arch-lh7a40x/dma.h b/trunk/include/asm-arm/arch-lh7a40x/dma.h
@@ -11,7 +11,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS		0xffffffff
 #define MAX_DMA_CHANNELS	0 /* All DMA is internal to CPU */
 
 #endif /* _ASM_ARCH_DMA_H */
diff --git a/trunk/include/asm-arm/arch-omap/dma.h b/trunk/include/asm-arm/arch-omap/dma.h
@@ -21,7 +21,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS			0xffffffff
 #define MAX_DMA_CHANNELS		0
 
 /* Hardware registers for omap1 */

diff --git a/trunk/include/asm-arm/arch-pxa/dma.h b/trunk/include/asm-arm/arch-pxa/dma.h
@@ -12,8 +12,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS		0xffffffff
-
 /* No DMA as the rest of the world see it */
 #define MAX_DMA_CHANNELS	0
 

diff --git a/trunk/include/asm-arm/arch-realview/dma.h b/trunk/include/asm-arm/arch-realview/dma.h
@@ -21,7 +21,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS		0xffffffff
 #define MAX_DMA_CHANNELS	0
 
 #endif /* _ASM_ARCH_DMA_H */
diff --git a/trunk/include/asm-arm/arch-sa1100/dma.h b/trunk/include/asm-arm/arch-sa1100/dma.h
@@ -14,12 +14,6 @@
 #include "hardware.h"
 
 
-/*
- * This is the maximum DMA address that can be DMAd to.
- */
-#define MAX_DMA_ADDRESS		0xffffffff
-
-
 /*
  * The regular generic DMA interface is inappropriate for the
  * SA1100 DMA model.  None of the SA1100 specific drivers using

diff --git a/trunk/include/asm-arm/arch-versatile/dma.h b/trunk/include/asm-arm/arch-versatile/dma.h
@@ -21,7 +21,6 @@
 #ifndef __ASM_ARCH_DMA_H
 #define __ASM_ARCH_DMA_H
 
-#define MAX_DMA_ADDRESS		0xffffffff
 #define MAX_DMA_CHANNELS	0
 
 #endif /* _ASM_ARCH_DMA_H */
diff --git a/trunk/include/asm-arm/dma.h b/trunk/include/asm-arm/dma.h
@@ -9,6 +9,13 @@ typedef unsigned int dmach_t;
 #include <asm/scatterlist.h>
 #include <asm/arch/dma.h>
 
+/*
+ * This is the maximum virtual address which can be DMA'd from.
+ */
+#ifndef MAX_DMA_ADDRESS
+#define MAX_DMA_ADDRESS	0xffffffff
+#endif
+
 /*
  * DMA modes
  */