diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 11:06:29 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-12 03:36:49 -0400 |
commit | 2fb3ec5c9503ba8874e24170de2b40e8f1a58370 (patch) | |
tree | 9a2b25d2c410bc51e1a1155e7dcaab17f9673716 /arch/arm/mach-sa1100 | |
parent | 78fca1b95837a44983608302e89c7258981be9b3 (diff) |
ARM: Replace platform definition of ISA_DMA_THRESHOLD/MAX_DMA_ADDRESS
The values of ISA_DMA_THRESHOLD and MAX_DMA_ADDRESS are related; one is
the physical/bus address, the other is the virtual address. Both need
to be kept in step, so rather than having platforms define both, allow
them to define a single macro which sets both of these macros
appropraitely.
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/memory.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h index a44da6a2916c..090b82982abb 100644 --- a/arch/arm/mach-sa1100/include/mach/memory.h +++ b/arch/arm/mach-sa1100/include/mach/memory.h | |||
@@ -22,8 +22,7 @@ void sa1111_adjust_zones(unsigned long *size, unsigned long *holes); | |||
22 | #define arch_adjust_zones(size, holes) \ | 22 | #define arch_adjust_zones(size, holes) \ |
23 | sa1111_adjust_zones(size, holes) | 23 | sa1111_adjust_zones(size, holes) |
24 | 24 | ||
25 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1) | 25 | #define ARM_DMA_ZONE_SIZE SZ_1M |
26 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_1M) | ||
27 | 26 | ||
28 | #endif | 27 | #endif |
29 | #endif | 28 | #endif |