diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-04-03 15:34:05 +0200 |
|---|---|---|
| committer | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-04-03 15:34:05 +0200 |
| commit | 71bde24b27b74e98e8c4a4b253994b5e05ca42bf (patch) | |
| tree | b0ad378f86e73fa1ac65c81b694d6c3039e4b440 /linux/arch/arm/plat-mxc/include/mach/memory.h | |
| parent | 88c3b5d5fa67f017ba19a29c6ef2a28cbc492b90 (diff) | |
| download | mediapointer-dvb-s2-71bde24b27b74e98e8c4a4b253994b5e05ca42bf.tar.gz mediapointer-dvb-s2-71bde24b27b74e98e8c4a4b253994b5e05ca42bf.tar.bz2 | |
Add camera (CSI) driver for MX1
From: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Add support for CMOS Sensor Interface on i.MX1 and i.MXL SoCs.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
arch/arm/mach-mx1/Makefile | 5 +-
arch/arm/mach-mx1/devices.c | 2 +-
arch/arm/mach-mx1/ksym_mx1.c | 18 +
arch/arm/mach-mx1/mx1_camera_fiq.S | 35 ++
arch/arm/plat-mxc/include/mach/memory.h | 8 +
arch/arm/plat-mxc/include/mach/mx1_camera.h | 35 ++
drivers/media/video/Kconfig | 13 +-
drivers/media/video/Makefile | 1 +
drivers/media/video/mx1_camera.c | 827 +++++++++++++++++++++++++++
9 files changed, 941 insertions(+), 3 deletions(-)
create mode 100644 arch/arm/mach-mx1/ksym_mx1.c
create mode 100644 arch/arm/mach-mx1/mx1_camera_fiq.S
create mode 100644 arch/arm/plat-mxc/include/mach/mx1_camera.h
create mode 100644 drivers/media/video/mx1_camera.c
Diffstat (limited to 'linux/arch/arm/plat-mxc/include/mach/memory.h')
| -rw-r--r-- | linux/arch/arm/plat-mxc/include/mach/memory.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/arch/arm/plat-mxc/include/mach/memory.h b/linux/arch/arm/plat-mxc/include/mach/memory.h index cee836dfc..33bed2326 100644 --- a/linux/arch/arm/plat-mxc/include/mach/memory.h +++ b/linux/arch/arm/plat-mxc/include/mach/memory.h @@ -25,4 +25,12 @@ #define CONSISTENT_DMA_SIZE SZ_8M #endif +#if defined(CONFIG_MX1_VIDEO) +/* + * 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 /* __ASM_ARCH_MXC_MEMORY_H__ */ |