From afbf3d6ca6134f83d3707be40edaca84cfecd415 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 4 Jan 2006 15:30:48 +0000 Subject: [PATCH] --- yaml --- r: 16745 b: refs/heads/master c: d4c6fc9976dd70a27abc988ddbd6a746c1dba0a7 h: refs/heads/master i: 16743: 7ef50838c2f4834676eee4c617d9ff92f3dc6f98 v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-aaec2000/dma.h | 1 - trunk/include/asm-arm/arch-clps711x/dma.h | 2 -- trunk/include/asm-arm/arch-ebsa110/dma.h | 1 - trunk/include/asm-arm/arch-ebsa285/dma.h | 5 ----- trunk/include/asm-arm/arch-epxa10db/dma.h | 2 -- trunk/include/asm-arm/arch-imx/dma.h | 2 -- trunk/include/asm-arm/arch-integrator/dma.h | 2 -- trunk/include/asm-arm/arch-iop3xx/dma.h | 2 -- trunk/include/asm-arm/arch-ixp2000/dma.h | 2 -- trunk/include/asm-arm/arch-lh7a40x/dma.h | 1 - trunk/include/asm-arm/arch-omap/dma.h | 1 - trunk/include/asm-arm/arch-pxa/dma.h | 2 -- trunk/include/asm-arm/arch-realview/dma.h | 1 - trunk/include/asm-arm/arch-sa1100/dma.h | 6 ------ trunk/include/asm-arm/arch-versatile/dma.h | 1 - trunk/include/asm-arm/dma.h | 7 +++++++ 17 files changed, 8 insertions(+), 32 deletions(-) diff --git a/[refs] b/[refs] index 2b6bdac76ee1..f0a24c27632c 100644 --- 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 index 28c890b4a1d3..c42212c9ea79 100644 --- 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 index 3c4c5c843252..c35f87d0bf7a 100644 --- 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 index d491776ac1cc..f1add1343edc 100644 --- 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 index c43046eb8bc7..0259ad45d33c 100644 --- 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 index 5d97734d1077..6e13e6bb8b1d 100644 --- 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 index dbdc01780413..0b8f39adc9a7 100644 --- 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 index 7171792290bd..6f934f6d838a 100644 --- 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 index 797f9e6fc745..58ec24db415d 100644 --- 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 index 0fb3568a98dd..3af382551cda 100644 --- 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 index 5797f01e1844..18f13689a405 100644 --- 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 index ccbcb580a5c1..40c045404613 100644 --- 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 index 56db3d49bfc8..7402bdafc163 100644 --- 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 index 744491a74bd9..d595cc90b069 100644 --- 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 index 3d60ed9f8c34..a79c2d37c669 100644 --- 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 index dcc8ac26eac0..94b3fc5a6321 100644 --- 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 index 1c7087f9364c..49c01e2bf7c8 100644 --- a/trunk/include/asm-arm/dma.h +++ b/trunk/include/asm-arm/dma.h @@ -9,6 +9,13 @@ typedef unsigned int dmach_t; #include #include +/* + * This is the maximum virtual address which can be DMA'd from. + */ +#ifndef MAX_DMA_ADDRESS +#define MAX_DMA_ADDRESS 0xffffffff +#endif + /* * DMA modes */