diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/arch-aaec2000/dma.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-clps711x/dma.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-ebsa110/dma.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-ebsa285/dma.h | 5 | ||||
-rw-r--r-- | include/asm-arm/arch-epxa10db/dma.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-imx/dma.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-integrator/dma.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-iop3xx/dma.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-ixp2000/dma.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-lh7a40x/dma.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-omap/dma.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-pxa/dma.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-realview/dma.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-sa1100/dma.h | 6 | ||||
-rw-r--r-- | include/asm-arm/arch-versatile/dma.h | 1 | ||||
-rw-r--r-- | include/asm-arm/dma.h | 7 |
16 files changed, 7 insertions, 31 deletions
diff --git a/include/asm-arm/arch-aaec2000/dma.h b/include/asm-arm/arch-aaec2000/dma.h index 28c890b4a1d3..c42212c9ea79 100644 --- a/include/asm-arm/arch-aaec2000/dma.h +++ b/include/asm-arm/arch-aaec2000/dma.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef __ASM_ARCH_DMA_H | 11 | #ifndef __ASM_ARCH_DMA_H |
12 | #define __ASM_ARCH_DMA_H | 12 | #define __ASM_ARCH_DMA_H |
13 | 13 | ||
14 | #define MAX_DMA_ADDRESS 0xffffffff | ||
15 | #define MAX_DMA_CHANNELS 0 | 14 | #define MAX_DMA_CHANNELS 0 |
16 | 15 | ||
17 | #endif | 16 | #endif |
diff --git a/include/asm-arm/arch-clps711x/dma.h b/include/asm-arm/arch-clps711x/dma.h index 3c4c5c843252..c35f87d0bf7a 100644 --- a/include/asm-arm/arch-clps711x/dma.h +++ b/include/asm-arm/arch-clps711x/dma.h | |||
@@ -20,8 +20,6 @@ | |||
20 | #ifndef __ASM_ARCH_DMA_H | 20 | #ifndef __ASM_ARCH_DMA_H |
21 | #define __ASM_ARCH_DMA_H | 21 | #define __ASM_ARCH_DMA_H |
22 | 22 | ||
23 | #define MAX_DMA_ADDRESS 0xffffffff | ||
24 | |||
25 | #define MAX_DMA_CHANNELS 0 | 23 | #define MAX_DMA_CHANNELS 0 |
26 | 24 | ||
27 | #endif /* _ASM_ARCH_DMA_H */ | 25 | #endif /* _ASM_ARCH_DMA_H */ |
diff --git a/include/asm-arm/arch-ebsa110/dma.h b/include/asm-arm/arch-ebsa110/dma.h index d491776ac1cc..f1add1343edc 100644 --- a/include/asm-arm/arch-ebsa110/dma.h +++ b/include/asm-arm/arch-ebsa110/dma.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #ifndef __ASM_ARCH_DMA_H | 12 | #ifndef __ASM_ARCH_DMA_H |
13 | #define __ASM_ARCH_DMA_H | 13 | #define __ASM_ARCH_DMA_H |
14 | 14 | ||
15 | #define MAX_DMA_ADDRESS 0xffffffff | ||
16 | #define MAX_DMA_CHANNELS 0 | 15 | #define MAX_DMA_CHANNELS 0 |
17 | 16 | ||
18 | #endif /* _ASM_ARCH_DMA_H */ | 17 | #endif /* _ASM_ARCH_DMA_H */ |
diff --git a/include/asm-arm/arch-ebsa285/dma.h b/include/asm-arm/arch-ebsa285/dma.h index c43046eb8bc7..0259ad45d33c 100644 --- a/include/asm-arm/arch-ebsa285/dma.h +++ b/include/asm-arm/arch-ebsa285/dma.h | |||
@@ -10,11 +10,6 @@ | |||
10 | #define __ASM_ARCH_DMA_H | 10 | #define __ASM_ARCH_DMA_H |
11 | 11 | ||
12 | /* | 12 | /* |
13 | * This is the maximum DMA address that can be DMAd to. | ||
14 | */ | ||
15 | #define MAX_DMA_ADDRESS 0xffffffff | ||
16 | |||
17 | /* | ||
18 | * The 21285 has two internal DMA channels; we call these 8 and 9. | 13 | * The 21285 has two internal DMA channels; we call these 8 and 9. |
19 | * On CATS hardware we have an additional eight ISA dma channels | 14 | * On CATS hardware we have an additional eight ISA dma channels |
20 | * numbered 0..7. | 15 | * numbered 0..7. |
diff --git a/include/asm-arm/arch-epxa10db/dma.h b/include/asm-arm/arch-epxa10db/dma.h index 5d97734d1077..6e13e6bb8b1d 100644 --- a/include/asm-arm/arch-epxa10db/dma.h +++ b/include/asm-arm/arch-epxa10db/dma.h | |||
@@ -20,8 +20,6 @@ | |||
20 | #ifndef __ASM_ARCH_DMA_H | 20 | #ifndef __ASM_ARCH_DMA_H |
21 | #define __ASM_ARCH_DMA_H | 21 | #define __ASM_ARCH_DMA_H |
22 | 22 | ||
23 | #define MAX_DMA_ADDRESS 0xffffffff | ||
24 | |||
25 | #define MAX_DMA_CHANNELS 0 | 23 | #define MAX_DMA_CHANNELS 0 |
26 | 24 | ||
27 | #endif /* _ASM_ARCH_DMA_H */ | 25 | #endif /* _ASM_ARCH_DMA_H */ |
diff --git a/include/asm-arm/arch-imx/dma.h b/include/asm-arm/arch-imx/dma.h index dbdc01780413..0b8f39adc9a7 100644 --- a/include/asm-arm/arch-imx/dma.h +++ b/include/asm-arm/arch-imx/dma.h | |||
@@ -20,8 +20,6 @@ | |||
20 | #ifndef __ASM_ARCH_DMA_H | 20 | #ifndef __ASM_ARCH_DMA_H |
21 | #define __ASM_ARCH_DMA_H | 21 | #define __ASM_ARCH_DMA_H |
22 | 22 | ||
23 | #define MAX_DMA_ADDRESS 0xffffffff | ||
24 | |||
25 | #define MAX_DMA_CHANNELS 0 | 23 | #define MAX_DMA_CHANNELS 0 |
26 | 24 | ||
27 | /* | 25 | /* |
diff --git a/include/asm-arm/arch-integrator/dma.h b/include/asm-arm/arch-integrator/dma.h index 7171792290bd..6f934f6d838a 100644 --- a/include/asm-arm/arch-integrator/dma.h +++ b/include/asm-arm/arch-integrator/dma.h | |||
@@ -20,8 +20,6 @@ | |||
20 | #ifndef __ASM_ARCH_DMA_H | 20 | #ifndef __ASM_ARCH_DMA_H |
21 | #define __ASM_ARCH_DMA_H | 21 | #define __ASM_ARCH_DMA_H |
22 | 22 | ||
23 | #define MAX_DMA_ADDRESS 0xffffffff | ||
24 | |||
25 | #define MAX_DMA_CHANNELS 0 | 23 | #define MAX_DMA_CHANNELS 0 |
26 | 24 | ||
27 | #endif /* _ASM_ARCH_DMA_H */ | 25 | #endif /* _ASM_ARCH_DMA_H */ |
diff --git a/include/asm-arm/arch-iop3xx/dma.h b/include/asm-arm/arch-iop3xx/dma.h index 797f9e6fc745..58ec24db415d 100644 --- a/include/asm-arm/arch-iop3xx/dma.h +++ b/include/asm-arm/arch-iop3xx/dma.h | |||
@@ -11,6 +11,4 @@ | |||
11 | #ifndef _IOP3XX_DMA_H_P | 11 | #ifndef _IOP3XX_DMA_H_P |
12 | #define _IOP3XX_DMA_H_P | 12 | #define _IOP3XX_DMA_H_P |
13 | 13 | ||
14 | #define MAX_DMA_ADDRESS 0xffffffff | ||
15 | |||
16 | #endif /* _ASM_ARCH_DMA_H_P */ | 14 | #endif /* _ASM_ARCH_DMA_H_P */ |
diff --git a/include/asm-arm/arch-ixp2000/dma.h b/include/asm-arm/arch-ixp2000/dma.h index 0fb3568a98dd..3af382551cda 100644 --- a/include/asm-arm/arch-ixp2000/dma.h +++ b/include/asm-arm/arch-ixp2000/dma.h | |||
@@ -10,8 +10,6 @@ | |||
10 | #ifndef __ASM_ARCH_DMA_H | 10 | #ifndef __ASM_ARCH_DMA_H |
11 | #define __ASM_ARCH_DMA_H | 11 | #define __ASM_ARCH_DMA_H |
12 | 12 | ||
13 | #define MAX_DMA_ADDRESS 0xffffffff | ||
14 | |||
15 | /* No DMA */ | 13 | /* No DMA */ |
16 | #define MAX_DMA_CHANNELS 0 | 14 | #define MAX_DMA_CHANNELS 0 |
17 | 15 | ||
diff --git a/include/asm-arm/arch-lh7a40x/dma.h b/include/asm-arm/arch-lh7a40x/dma.h index 5797f01e1844..18f13689a405 100644 --- a/include/asm-arm/arch-lh7a40x/dma.h +++ b/include/asm-arm/arch-lh7a40x/dma.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef __ASM_ARCH_DMA_H | 11 | #ifndef __ASM_ARCH_DMA_H |
12 | #define __ASM_ARCH_DMA_H | 12 | #define __ASM_ARCH_DMA_H |
13 | 13 | ||
14 | #define MAX_DMA_ADDRESS 0xffffffff | ||
15 | #define MAX_DMA_CHANNELS 0 /* All DMA is internal to CPU */ | 14 | #define MAX_DMA_CHANNELS 0 /* All DMA is internal to CPU */ |
16 | 15 | ||
17 | #endif /* _ASM_ARCH_DMA_H */ | 16 | #endif /* _ASM_ARCH_DMA_H */ |
diff --git a/include/asm-arm/arch-omap/dma.h b/include/asm-arm/arch-omap/dma.h index ccbcb580a5c1..40c045404613 100644 --- a/include/asm-arm/arch-omap/dma.h +++ b/include/asm-arm/arch-omap/dma.h | |||
@@ -21,7 +21,6 @@ | |||
21 | #ifndef __ASM_ARCH_DMA_H | 21 | #ifndef __ASM_ARCH_DMA_H |
22 | #define __ASM_ARCH_DMA_H | 22 | #define __ASM_ARCH_DMA_H |
23 | 23 | ||
24 | #define MAX_DMA_ADDRESS 0xffffffff | ||
25 | #define MAX_DMA_CHANNELS 0 | 24 | #define MAX_DMA_CHANNELS 0 |
26 | 25 | ||
27 | /* Hardware registers for omap1 */ | 26 | /* Hardware registers for omap1 */ |
diff --git a/include/asm-arm/arch-pxa/dma.h b/include/asm-arm/arch-pxa/dma.h index 56db3d49bfc8..7402bdafc163 100644 --- a/include/asm-arm/arch-pxa/dma.h +++ b/include/asm-arm/arch-pxa/dma.h | |||
@@ -12,8 +12,6 @@ | |||
12 | #ifndef __ASM_ARCH_DMA_H | 12 | #ifndef __ASM_ARCH_DMA_H |
13 | #define __ASM_ARCH_DMA_H | 13 | #define __ASM_ARCH_DMA_H |
14 | 14 | ||
15 | #define MAX_DMA_ADDRESS 0xffffffff | ||
16 | |||
17 | /* No DMA as the rest of the world see it */ | 15 | /* No DMA as the rest of the world see it */ |
18 | #define MAX_DMA_CHANNELS 0 | 16 | #define MAX_DMA_CHANNELS 0 |
19 | 17 | ||
diff --git a/include/asm-arm/arch-realview/dma.h b/include/asm-arm/arch-realview/dma.h index 744491a74bd9..d595cc90b069 100644 --- a/include/asm-arm/arch-realview/dma.h +++ b/include/asm-arm/arch-realview/dma.h | |||
@@ -21,7 +21,6 @@ | |||
21 | #ifndef __ASM_ARCH_DMA_H | 21 | #ifndef __ASM_ARCH_DMA_H |
22 | #define __ASM_ARCH_DMA_H | 22 | #define __ASM_ARCH_DMA_H |
23 | 23 | ||
24 | #define MAX_DMA_ADDRESS 0xffffffff | ||
25 | #define MAX_DMA_CHANNELS 0 | 24 | #define MAX_DMA_CHANNELS 0 |
26 | 25 | ||
27 | #endif /* _ASM_ARCH_DMA_H */ | 26 | #endif /* _ASM_ARCH_DMA_H */ |
diff --git a/include/asm-arm/arch-sa1100/dma.h b/include/asm-arm/arch-sa1100/dma.h index 3d60ed9f8c34..a79c2d37c669 100644 --- a/include/asm-arm/arch-sa1100/dma.h +++ b/include/asm-arm/arch-sa1100/dma.h | |||
@@ -15,12 +15,6 @@ | |||
15 | 15 | ||
16 | 16 | ||
17 | /* | 17 | /* |
18 | * This is the maximum DMA address that can be DMAd to. | ||
19 | */ | ||
20 | #define MAX_DMA_ADDRESS 0xffffffff | ||
21 | |||
22 | |||
23 | /* | ||
24 | * The regular generic DMA interface is inappropriate for the | 18 | * The regular generic DMA interface is inappropriate for the |
25 | * SA1100 DMA model. None of the SA1100 specific drivers using | 19 | * SA1100 DMA model. None of the SA1100 specific drivers using |
26 | * DMA are portable anyway so it's pointless to try to twist the | 20 | * DMA are portable anyway so it's pointless to try to twist the |
diff --git a/include/asm-arm/arch-versatile/dma.h b/include/asm-arm/arch-versatile/dma.h index dcc8ac26eac0..94b3fc5a6321 100644 --- a/include/asm-arm/arch-versatile/dma.h +++ b/include/asm-arm/arch-versatile/dma.h | |||
@@ -21,7 +21,6 @@ | |||
21 | #ifndef __ASM_ARCH_DMA_H | 21 | #ifndef __ASM_ARCH_DMA_H |
22 | #define __ASM_ARCH_DMA_H | 22 | #define __ASM_ARCH_DMA_H |
23 | 23 | ||
24 | #define MAX_DMA_ADDRESS 0xffffffff | ||
25 | #define MAX_DMA_CHANNELS 0 | 24 | #define MAX_DMA_CHANNELS 0 |
26 | 25 | ||
27 | #endif /* _ASM_ARCH_DMA_H */ | 26 | #endif /* _ASM_ARCH_DMA_H */ |
diff --git a/include/asm-arm/dma.h b/include/asm-arm/dma.h index 1c7087f9364c..49c01e2bf7c8 100644 --- a/include/asm-arm/dma.h +++ b/include/asm-arm/dma.h | |||
@@ -10,6 +10,13 @@ typedef unsigned int dmach_t; | |||
10 | #include <asm/arch/dma.h> | 10 | #include <asm/arch/dma.h> |
11 | 11 | ||
12 | /* | 12 | /* |
13 | * This is the maximum virtual address which can be DMA'd from. | ||
14 | */ | ||
15 | #ifndef MAX_DMA_ADDRESS | ||
16 | #define MAX_DMA_ADDRESS 0xffffffff | ||
17 | #endif | ||
18 | |||
19 | /* | ||
13 | * DMA modes | 20 | * DMA modes |
14 | */ | 21 | */ |
15 | typedef unsigned int dmamode_t; | 22 | typedef unsigned int dmamode_t; |