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 | |
| 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')
| -rw-r--r-- | linux/arch/arm/plat-mxc/include/mach/memory.h | 8 | ||||
| -rw-r--r-- | linux/arch/arm/plat-mxc/include/mach/mx1_camera.h | 35 |
2 files changed, 43 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__ */ diff --git a/linux/arch/arm/plat-mxc/include/mach/mx1_camera.h b/linux/arch/arm/plat-mxc/include/mach/mx1_camera.h new file mode 100644 index 000000000..4fd6c7031 --- /dev/null +++ b/linux/arch/arm/plat-mxc/include/mach/mx1_camera.h @@ -0,0 +1,35 @@ +/* + * mx1_camera.h - i.MX1/i.MXL camera driver header file + * + * Copyright (c) 2008, Paulius Zaleckas <paulius.zaleckas@teltonika.lt> + * Copyright (C) 2009, Darius Augulis <augulis.darius@gmail.com> + * + * Based on PXA camera.h file: + * Copyright (C) 2003, Intel Corporation + * Copyright (C) 2008, Guennadi Liakhovetski <kernel@pengutronix.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __ASM_ARCH_CAMERA_H_ +#define __ASM_ARCH_CAMERA_H_ + +#define MX1_CAMERA_DATA_HIGH 1 +#define MX1_CAMERA_PCLK_RISING 2 +#define MX1_CAMERA_VSYNC_HIGH 4 + +extern unsigned char mx1_camera_sof_fiq_start, mx1_camera_sof_fiq_end; + +/** + * struct mx1_camera_pdata - i.MX1/i.MXL camera platform data + * @mclk_10khz: master clock frequency in 10kHz units + * @flags: MX1 camera platform flags + */ +struct mx1_camera_pdata { + unsigned long mclk_10khz; + unsigned long flags; +}; + +#endif /* __ASM_ARCH_CAMERA_H_ */ |