diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-17 21:05:27 +0100 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-24 10:07:06 +0100 |
| commit | 8e3a6e7fa739d021324d813cd6fdd1c5c7998774 (patch) | |
| tree | 1784bb78c570c18945f1cba974c4948b5f6c6538 /arch/arm/plat-mxc/include/mach/memory.h | |
| parent | abf61632884ae6bfd1e7b967d5254fa7b5191e7b (diff) | |
| download | kernel_samsung_smdk4412-8e3a6e7fa739d021324d813cd6fdd1c5c7998774.zip kernel_samsung_smdk4412-8e3a6e7fa739d021324d813cd6fdd1c5c7998774.tar.gz kernel_samsung_smdk4412-8e3a6e7fa739d021324d813cd6fdd1c5c7998774.tar.bz2 | |
arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 and mx3
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/memory.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index 002eb91..d636564 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h @@ -34,20 +34,19 @@ # endif #endif -#if defined(CONFIG_MX1_VIDEO) +#if defined(CONFIG_MX3_VIDEO) /* * Increase size of DMA-consistent memory region. - * This is required for i.MX camera driver to capture at least four VGA frames. + * This is required for mx3 camera driver to capture at least two QXGA frames. */ -#define CONSISTENT_DMA_SIZE SZ_4M -#endif /* CONFIG_MX1_VIDEO */ +#define CONSISTENT_DMA_SIZE SZ_8M -#if defined(CONFIG_MX3_VIDEO) +#elif defined(CONFIG_MX1_VIDEO) /* * Increase size of DMA-consistent memory region. - * This is required for mx3 camera driver to capture at least two QXGA frames. + * This is required for i.MX camera driver to capture at least four VGA frames. */ -#define CONSISTENT_DMA_SIZE SZ_8M -#endif /* CONFIG_MX3_VIDEO */ +#define CONSISTENT_DMA_SIZE SZ_4M +#endif /* CONFIG_MX1_VIDEO */ #endif /* __ASM_ARCH_MXC_MEMORY_H__ */ |