Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2066930d authored by Baruch Siach's avatar Baruch Siach Committed by Sascha Hauer
Browse files

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: default avatarBaruch Siach <baruch@tkos.co.il>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 14cb0deb

arch/arm/plat-mxc/include/mach/memory.h

+2 −2
Original line number Diff line number Diff line
@@ -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__ */

arch/arm/plat-mxc/include/mach/mx2_cam.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * mx2-cam.h - i.MX27/i.MX25 camera driver header file

 *

 * Copyright (C) 2003, Intel Corporation

 * Copyright (C) 2008, Sascha Hauer <s.hauer@pengutronix.de>

 * Copyright (C) 2010, Baruch Siach <baruch@tkos.co.il>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.

 */



#ifndef __MACH_MX2_CAM_H_

#define __MACH_MX2_CAM_H_



#define MX2_CAMERA_SWAP16		(1 << 0)

#define MX2_CAMERA_EXT_VSYNC		(1 << 1)

#define MX2_CAMERA_CCIR			(1 << 2)

#define MX2_CAMERA_CCIR_INTERLACE	(1 << 3)

#define MX2_CAMERA_HSYNC_HIGH		(1 << 4)

#define MX2_CAMERA_GATED_CLOCK		(1 << 5)

#define MX2_CAMERA_INV_DATA		(1 << 6)

#define MX2_CAMERA_PCLK_SAMPLE_RISING	(1 << 7)

#define MX2_CAMERA_PACK_DIR_MSB		(1 << 8)



/**

 * struct mx2_camera_platform_data - optional platform data for mx2_camera

 * @flags: any combination of MX2_CAMERA_*

 * @clk: clock rate of the csi block / 2

 */

struct mx2_camera_platform_data {

	unsigned long flags;

	unsigned long clk;

};



#endif /* __MACH_MX2_CAM_H_ */

drivers/media/video/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -969,6 +969,19 @@ config VIDEO_OMAP2 
	---help---

	  This is a v4l2 driver for the TI OMAP2 camera capture interface



config VIDEO_MX2_HOSTSUPPORT

        bool



config VIDEO_MX2

	tristate "i.MX27/i.MX25 Camera Sensor Interface driver"

	depends on VIDEO_DEV && SOC_CAMERA && (MACH_MX27 || ARCH_MX25)

	select VIDEOBUF_DMA_CONTIG

	select VIDEO_MX2_HOSTSUPPORT

	---help---

	  This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor

	  Interface





#

# USB Multimedia device configuration

#

drivers/media/video/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ obj-$(CONFIG_SOC_CAMERA) += soc_camera.o soc_mediabus.o 
obj-$(CONFIG_SOC_CAMERA_PLATFORM)	+= soc_camera_platform.o

# soc-camera host drivers have to be linked after camera drivers

obj-$(CONFIG_VIDEO_MX1)			+= mx1_camera.o

obj-$(CONFIG_VIDEO_MX2)			+= mx2_camera.o

obj-$(CONFIG_VIDEO_MX3)			+= mx3_camera.o

obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o

obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o

drivers/media/video/mx2_camera.c

0 → 100644
+1513 −0

File added.

Preview size limit exceeded, changes collapsed.