diff options
-rw-r--r-- | arch/arm/mach-davinci/include/mach/memory.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-h720x/include/mach/memory.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/memory.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/memory.h | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/include/mach/memory.h b/arch/arm/mach-davinci/include/mach/memory.h index 3a3353357bac..86c25c7f3ce3 100644 --- a/arch/arm/mach-davinci/include/mach/memory.h +++ b/arch/arm/mach-davinci/include/mach/memory.h | |||
@@ -52,6 +52,7 @@ __arch_adjust_zones(int node, unsigned long *size, unsigned long *holes) | |||
52 | if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(node, zone_size, holes) | 52 | if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(node, zone_size, holes) |
53 | 53 | ||
54 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + (128<<20) - 1) | 54 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + (128<<20) - 1) |
55 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + (128<<20)) | ||
55 | 56 | ||
56 | #endif | 57 | #endif |
57 | 58 | ||
diff --git a/arch/arm/mach-h720x/include/mach/memory.h b/arch/arm/mach-h720x/include/mach/memory.h index c9bdb21a4445..ef4c1e26f18e 100644 --- a/arch/arm/mach-h720x/include/mach/memory.h +++ b/arch/arm/mach-h720x/include/mach/memory.h | |||
@@ -12,10 +12,8 @@ | |||
12 | * This is the maximum DMA address that can be DMAd to. | 12 | * This is the maximum DMA address that can be DMAd to. |
13 | * There should not be more than (0xd0000000 - 0xc0000000) | 13 | * There should not be more than (0xd0000000 - 0xc0000000) |
14 | * bytes of RAM. | 14 | * bytes of RAM. |
15 | * | ||
16 | * If you set this, you must also set ISA_DMA_THRESHOLD and setup a DMA | ||
17 | * zone if this does not cover all possible RAM. | ||
18 | */ | 15 | */ |
16 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_256M - 1) | ||
19 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M) | 17 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M) |
20 | 18 | ||
21 | #endif | 19 | #endif |
diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h index eac491c2d741..f626730ee42e 100644 --- a/arch/arm/mach-pxa/include/mach/memory.h +++ b/arch/arm/mach-pxa/include/mach/memory.h | |||
@@ -37,6 +37,7 @@ void cmx2xx_pci_adjust_zones(int node, unsigned long *size, | |||
37 | cmx2xx_pci_adjust_zones(node, size, holes) | 37 | cmx2xx_pci_adjust_zones(node, size, holes) |
38 | 38 | ||
39 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1) | 39 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1) |
40 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) | ||
40 | #endif | 41 | #endif |
41 | 42 | ||
42 | #endif | 43 | #endif |
diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h index 6984034f6958..e9f8eed900f5 100644 --- a/arch/arm/mach-sa1100/include/mach/memory.h +++ b/arch/arm/mach-sa1100/include/mach/memory.h | |||
@@ -23,6 +23,7 @@ void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes); | |||
23 | sa1111_adjust_zones(node, size, holes) | 23 | sa1111_adjust_zones(node, size, holes) |
24 | 24 | ||
25 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1) | 25 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1) |
26 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_1M) | ||
26 | 27 | ||
27 | #endif | 28 | #endif |
28 | #endif | 29 | #endif |