diff options
| author | Baruch Siach | 2010-07-04 06:55:10 +0200 |
|---|---|---|
| committer | Sascha Hauer | 2010-07-28 09:28:36 +0200 |
| commit | 2066930de6296ef7470de11eaa9b8bc9129721e8 (patch) | |
| tree | 109fb2f88a5dce7b95f58771845ed0feccaa4b92 /arch/arm/plat-mxc/include/mach/memory.h | |
| parent | arm/imx/gpio: add spinlock protection (diff) | |
| download | kernel-qcow2-linux-2066930de6296ef7470de11eaa9b8bc9129721e8.tar.gz kernel-qcow2-linux-2066930de6296ef7470de11eaa9b8bc9129721e8.tar.xz kernel-qcow2-linux-2066930de6296ef7470de11eaa9b8bc9129721e8.zip | |
mx2_camera: Add soc_camera support for i.MX25/i.MX27
This is the soc_camera support developed by Sascha Hauer for the i.MX27. Alan
Carvalho de Assis modified the original driver to get it working on more recent
kernels. I modified it further to add support for i.MX25. This driver has been
tested on i.MX25 and i.MX27 based platforms.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/memory.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index c4b40c35a6a1..564ec9dbc93d 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h @@ -44,12 +44,12 @@ */ #define CONSISTENT_DMA_SIZE SZ_8M -#elif defined(CONFIG_MX1_VIDEO) +#elif defined(CONFIG_MX1_VIDEO) || defined(CONFIG_VIDEO_MX2_HOSTSUPPORT) /* * Increase size of DMA-consistent memory region. * This is required for i.MX camera driver to capture at least four VGA frames. */ #define CONSISTENT_DMA_SIZE SZ_4M -#endif /* CONFIG_MX1_VIDEO */ +#endif /* CONFIG_MX1_VIDEO || CONFIG_VIDEO_MX2_HOSTSUPPORT */ #endif /* __ASM_ARCH_MXC_MEMORY_H__ */ |