diff options
| author | Eric Miao <eric.miao@linaro.org> | 2011-04-29 20:31:06 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-04-29 21:49:53 +0800 |
| commit | 4ca3f6ddf0deec4b3646eea56cfdb951942de8a5 (patch) | |
| tree | 7fad04d76a2c14fdb8f1cadabeae205c3b28007c | |
| parent | 8d4e56f053742fb94551f90271eca84c7ddf5910 (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/include/mach/memory.h | 4 | ||||
| -rw-r--r-- | debian.linaro/config/config.common.ubuntu | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index 40647df8281..aecbd733cdf 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h @@ -62,7 +62,7 @@ #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 @@ -71,6 +71,7 @@ #ifndef __ASSEMBLY__ +#if 0 #ifdef CONFIG_DMA_ZONE_SIZE #define MXC_DMA_ZONE_SIZE ((CONFIG_DMA_ZONE_SIZE * SZ_1M) >> PAGE_SHIFT) #else @@ -89,6 +90,7 @@ static inline void __arch_adjust_zones(unsigned long *zone_size, #define arch_adjust_zones(size, holes) \ __arch_adjust_zones(size, holes) +#endif #endif diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu index 88370d297a0..91bc9c15168 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -375,7 +375,7 @@ CONFIG_DMADEVICES=y # CONFIG_DMATEST is not set # CONFIG_DMA_API_DEBUG is not set CONFIG_DMA_ENGINE=y -CONFIG_DMA_ZONE_SIZE=96 +CONFIG_DMA_ZONE_SIZE=24 CONFIG_DM_CRYPT=m # CONFIG_DM_DEBUG is not set CONFIG_DM_DELAY=m |