aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-29 10:50:22 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-29 10:50:22 +0000
commitb9c78022b0e65cdca2541be658f0e74138e92ffe (patch)
treee23644c81ea8218b6852645a392e68f98c9775b9 /arch/arm/mach-s3c2410
parent5bed1fb3287dfb1f6cf717ec200b23d3e537c9ae (diff)
[ARM] move MAX_DMA_ADDRESS to mach/memory.h
Move the definition of MAX_DMA_ADDRESS from mach/dma.h to mach/memory.h, thereby placing it along side its relative, ISA_DMA_THRESHOLD. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/dma.h5
-rw-r--r--arch/arm/mach-s3c2410/include/mach/memory.h8
2 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/dma.h b/arch/arm/mach-s3c2410/include/mach/dma.h
index 891b53cd69b..7cbea7b82b5 100644
--- a/arch/arm/mach-s3c2410/include/mach/dma.h
+++ b/arch/arm/mach-s3c2410/include/mach/dma.h
@@ -16,11 +16,6 @@
#include <linux/sysdev.h>
#include <mach/hardware.h>
-/*
- * This is the maximum DMA address(physical address) that can be DMAd to.
- *
- */
-#define MAX_DMA_ADDRESS 0x40000000
#define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */
/* We use `virtual` dma channels to hide the fact we have only a limited
diff --git a/arch/arm/mach-s3c2410/include/mach/memory.h b/arch/arm/mach-s3c2410/include/mach/memory.h
index 6f1e5871ae4..2246966bbbe 100644
--- a/arch/arm/mach-s3c2410/include/mach/memory.h
+++ b/arch/arm/mach-s3c2410/include/mach/memory.h
@@ -13,4 +13,12 @@
#define PHYS_OFFSET UL(0x30000000)
+/*
+ * This is the maximum DMA address(physical address) that can be DMAd to.
+ * Err, no, this is a virtual address. And you must set ISA_DMA_THRESHOLD
+ * and setup a DMA zone if this restricts the amount of RAM which is
+ * capable of DMA.
+ */
+#define MAX_DMA_ADDRESS 0x40000000
+
#endif