diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-04-29 20:31:06 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-08-16 11:37:03 +0800 |
| commit | 3e420ece0f7d774cbc7fd9a88e8a261efa5a0f4c (patch) | |
| tree | 51aab3658748ea9e29374ffe3701f431bd6d7f38 | |
| parent | 2d3564ca749e0032f92b9152c1a24d3fd7aa180c (diff) | |
SAUCE: MX5: increase coherent DMA size to 128M and remove arch_adjust_zone() trick
BugLink: http://bugs.launchpad.net/bugs/773043
Signed-off-by: Eric Miao <eric.miao@linaro.org>
| -rw-r--r-- | arch/arm/plat-mxc/Kconfig | 8 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h | 25 |
2 files changed, 1 insertions, 32 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index 50ff483e7c3d..71f7cc84c22c 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -137,14 +137,6 @@ config IRAM_ALLOC default y select GENERIC_ALLOCATOR -config DMA_ZONE_SIZE - int "DMA memory zone size" - range 0 96 - default 24 - help - This is the size in MB for the DMA zone. The DMA zone is used for - dedicated memory for large contiguous video buffers - config CLK_DEBUG bool "clock debug information export to user space" depends on PM_DEBUG && DEBUG_FS diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index 40647df82816..2b1f0153df0e 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h @@ -62,34 +62,11 @@ #else #ifdef CONFIG_ARCH_MX5 -#define CONSISTENT_DMA_SIZE (96 * SZ_1M) +#define CONSISTENT_DMA_SIZE (128 * SZ_1M) #else #define CONSISTENT_DMA_SIZE (32 * SZ_1M) #endif #endif /* CONFIG_MX1_VIDEO || CONFIG_VIDEO_MX2_HOSTSUPPORT */ -#ifndef __ASSEMBLY__ - -#ifdef CONFIG_DMA_ZONE_SIZE -#define MXC_DMA_ZONE_SIZE ((CONFIG_DMA_ZONE_SIZE * SZ_1M) >> PAGE_SHIFT) -#else -#define MXC_DMA_ZONE_SIZE ((12 * SZ_1M) >> PAGE_SHIFT) -#endif - -static inline void __arch_adjust_zones(unsigned long *zone_size, - unsigned long *zhole_size) -{ - /* Create separate zone to reserve memory for DMA */ - zone_size[1] = zone_size[0] - MXC_DMA_ZONE_SIZE; - zone_size[0] = MXC_DMA_ZONE_SIZE; - zhole_size[1] = zhole_size[0]; - zhole_size[0] = 0; -} - -#define arch_adjust_zones(size, holes) \ - __arch_adjust_zones(size, holes) - -#endif - #endif /* __ASM_ARCH_MXC_MEMORY_H__ */ |