diff options
| author | Luotao Fu <l.fu@pengutronix.de> | 2009-05-22 16:08:44 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-27 10:42:04 +0200 |
| commit | 47b4416fcd06d2c999c83f07d9e7c2f741afa04b (patch) | |
| tree | a1fce3f9b12ac0d48d6e56c51059d9bec465ea86 | |
| parent | e93d7a73b0e4e11cc44d866269738da7f2717bd4 (diff) | |
| download | linux-2.6-47b4416fcd06d2c999c83f07d9e7c2f741afa04b.tar.gz linux-2.6-47b4416fcd06d2c999c83f07d9e7c2f741afa04b.tar.xz | |
mx27: changed CONSISTENT_DMA_SIZE to 16M for mx27 video
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/memory.h | 8 | ||||
| -rw-r--r-- | drivers/media/video/Kconfig | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h index 1e15efe9e29..d2d4e7a6fe7 100644 --- a/arch/arm/plat-mxc/include/mach/memory.h +++ b/arch/arm/plat-mxc/include/mach/memory.h @@ -32,6 +32,14 @@ #define CONSISTENT_DMA_SIZE SZ_4M #endif /* CONFIG_MX1_VIDEO */ +#if defined(CONFIG_MX2_VIDEO) +/* + * Increase size of DMA-consistent memory region. + * This is required for mx2 camera driver to capture at least two QXGA frames. + */ +#define CONSISTENT_DMA_SIZE SZ_16M +#endif /* CONFIG_MX3_VIDEO */ + #if defined(CONFIG_MX3_VIDEO) /* * Increase size of DMA-consistent memory region. diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 18514097c55..176d37eb2d8 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -790,11 +790,15 @@ config VIDEO_OMAP2 ---help--- This is a v4l2 driver for the TI OMAP2 camera capture interface +config MX2_VIDEO + bool + config VIDEO_MX27 tristate "i.MX27 Quick Capture Interface driver" depends on VIDEO_DEV && MACH_MX27 select SOC_CAMERA select VIDEOBUF_DMA_CONTIG + select MX2_VIDEO ---help--- This is a v4l2 driver for the i.MX27 Capture Interface |