diff options
author | Russell King | 2011-05-11 17:06:29 +0200 |
---|---|---|
committer | Russell King | 2011-05-12 09:36:49 +0200 |
commit | 2fb3ec5c9503ba8874e24170de2b40e8f1a58370 (patch) | |
tree | 9a2b25d2c410bc51e1a1155e7dcaab17f9673716 /arch/arm/include/asm/dma.h | |
parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
download | kernel-qcow2-linux-2fb3ec5c9503ba8874e24170de2b40e8f1a58370.tar.gz kernel-qcow2-linux-2fb3ec5c9503ba8874e24170de2b40e8f1a58370.tar.xz kernel-qcow2-linux-2fb3ec5c9503ba8874e24170de2b40e8f1a58370.zip |
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/include/asm/dma.h')
-rw-r--r-- | arch/arm/include/asm/dma.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index ca51143f97f1..42005542932b 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h @@ -6,8 +6,10 @@ /* * This is the maximum virtual address which can be DMA'd from. */ -#ifndef MAX_DMA_ADDRESS +#ifndef ARM_DMA_ZONE_SIZE #define MAX_DMA_ADDRESS 0xffffffff +#else +#define MAX_DMA_ADDRESS (PAGE_OFFSET + ARM_DMA_ZONE_SIZE) #endif #ifdef CONFIG_ISA_DMA_API |