From 06ff02b8346c0ed77fabba84a1b984f53bfaecb6 Mon Sep 17 00:00:00 2001 From: Sergio Aguirre Date: Fri, 11 Jun 2010 16:15:58 -0500 Subject: [PATCH 04/71] omap3beagle: Add camera support This is tested with the xM + Leopard imaging module camera, which has a MT9T111. Signed-off-by: Sergio Aguirre --- arch/arm/mach-omap2/Makefile | 3 +- arch/arm/mach-omap2/board-omap3beagle-camera.c | 228 ++++++++++++++++++++++++ arch/arm/mach-omap2/board-omap3beagle-camera.h | 41 +++++ arch/arm/mach-omap2/board-omap3beagle.c | 25 +++ 4 files changed, 296 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-omap2/board-omap3beagle-camera.c create mode 100644 arch/arm/mach-omap2/board-omap3beagle-camera.h diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index fa01859..4d9dcdd 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -87,7 +87,8 @@ obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \ mmc-twl4030.o obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \ - mmc-twl4030.o + mmc-twl4030.o \ + board-omap3beagle-camera.o obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \ mmc-twl4030.o \ board-ldp-camera.o diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c new file mode 100644 index 0000000..e93437f --- /dev/null +++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c @@ -0,0 +1,228 @@ +/* + * Driver for Leopard Module Board used in Beagleboard (xM) + * + * Copyright (C) 2010 Texas Instruments Inc + * Author: Sergio Aguirre + * + * Based on work done by: + * Vaibhav Hiremath + * Anuj Aggarwal + * Sivaraj R + * + * This package 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. + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include + +/* Include V4L2 ISP-Camera driver related header file */ +#include <../drivers/media/video/omap34xxcam.h> +#include <../drivers/media/video/isp/ispreg.h> + +#include "mux.h" +#include "board-omap3beagle-camera.h" + +#define MODULE_NAME "omap3beaglelmb" + +#define MT9T111_I2C_BUSNUM (2) + +#define CAM_USE_XCLKA 1 + +#if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE) +static struct isp_interface_config mt9t111_if_config = { + .ccdc_par_ser = ISP_PARLL, + .dataline_shift = 0x0, + .hsvs_syncdetect = ISPCTRL_SYNC_DETECT_VSRISE, + .strobe = 0x0, + .prestrobe = 0x0, + .shutter = 0x0, + .u.par.par_bridge = 0x1, + .u.par.par_clk_pol = 0x0, +}; + +static struct v4l2_ifparm mt9t111_ifparm_s = { +#if 1 + .if_type = V4L2_IF_TYPE_RAW, + .u = { + .raw = { + .frame_start_on_rising_vs = 1, + .bt_sync_correct = 0, + .swap = 0, + .latch_clk_inv = 0, + .nobt_hs_inv = 0, /* active high */ + .nobt_vs_inv = 0, /* active high */ + .clock_min = MT9T111_CLK_MIN, + .clock_max = MT9T111_CLK_MAX, + }, + }, +#else + .if_type = V4L2_IF_TYPE_YCbCr, + .u = { + .ycbcr = { + .frame_start_on_rising_vs = 1, + .bt_sync_correct = 0, + .swap = 0, + .latch_clk_inv = 0, + .nobt_hs_inv = 0, /* active high */ + .nobt_vs_inv = 0, /* active high */ + .clock_min = MT9T111_CLK_MIN, + .clock_max = MT9T111_CLK_MAX, + }, + }, +#endif +}; + +/** + * @brief mt9t111_ifparm - Returns the mt9t111 interface parameters + * + * @param p - pointer to v4l2_ifparm structure + * + * @return result of operation - 0 is success + */ +static int mt9t111_ifparm(struct v4l2_ifparm *p) +{ + if (p == NULL) + return -EINVAL; + + *p = mt9t111_ifparm_s; + return 0; +} + +#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE) +static struct omap34xxcam_hw_config mt9t111_hwc = { + .dev_index = 0, + .dev_minor = 0, + .dev_type = OMAP34XXCAM_SLAVE_SENSOR, + .u.sensor.sensor_isp = 1, +}; +#endif + +/** + * @brief mt9t111_set_prv_data - Returns mt9t111 omap34xx driver private data + * + * @param priv - pointer to omap34xxcam_hw_config structure + * + * @return result of operation - 0 is success + */ +static int mt9t111_set_prv_data(void *priv) +{ +#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE) + struct omap34xxcam_hw_config *hwc = priv; + + if (priv == NULL) + return -EINVAL; + + hwc->u.sensor = mt9t111_hwc.u.sensor; + hwc->dev_index = mt9t111_hwc.dev_index; + hwc->dev_minor = mt9t111_hwc.dev_minor; + hwc->dev_type = mt9t111_hwc.dev_type; + return 0; +#else + return -EINVAL; +#endif +} + +/** + * @brief mt9t111_power_set - Power-on or power-off TVP5146 device + * + * @param power - enum, Power on/off, resume/standby + * + * @return result of operation - 0 is success + */ +static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power) +{ + struct omap34xxcam_videodev *vdev = s->u.slave->master->priv; + + switch (power) { + case V4L2_POWER_OFF: + isp_set_xclk(vdev->cam->isp, 0, CAM_USE_XCLKA); + break; + + case V4L2_POWER_STANDBY: + break; + + case V4L2_POWER_ON: + isp_set_xclk(vdev->cam->isp, MT9T111_CLK_MIN, CAM_USE_XCLKA); + +#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE) + isp_configure_interface(vdev->cam->isp, &mt9t111_if_config); +#endif + break; + + default: + return -ENODEV; + break; + } + return 0; +} + +static struct mt9t111_platform_data mt9t111_pdata = { + .master = "omap34xxcam", + .power_set = mt9t111_power_set, + .priv_data_set = mt9t111_set_prv_data, + .ifparm = mt9t111_ifparm, + /* Some interface dependent params */ + .clk_polarity = 0, /* data clocked out on falling edge */ + .hs_polarity = 1, /* 0 - Active low, 1- Active high */ + .vs_polarity = 1, /* 0 - Active low, 1- Active high */ +}; + +static struct i2c_board_info __initdata mt9t111_i2c_board_info = { + I2C_BOARD_INFO("mt9t111", MT9T111_I2C_ADDR), + .platform_data = &mt9t111_pdata, +}; + +#endif /* #ifdef CONFIG_VIDEO_MT9T111 */ + +/** + * @brief omap3beaglelmb_init - module init function. Should be called before any + * client driver init call + * + * @return result of operation - 0 is success + */ +int __init omap3beaglelmb_init(void) +{ + int err; + + /* + * Register the I2C devices present in the board to the I2C + * framework. + * If more I2C devices are added, then each device information should + * be registered with I2C using i2c_register_board_info(). + */ +#if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE) + err = i2c_register_board_info(MT9T111_I2C_BUSNUM, + &mt9t111_i2c_board_info, 1); + if (err) { + printk(KERN_ERR MODULE_NAME \ + ": MT9T111 I2C Board Registration failed \n"); + return err; + } +#endif + printk(KERN_INFO MODULE_NAME ": Driver registration complete \n"); + + return 0; +} +arch_initcall(omap3beaglelmb_init); diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.h b/arch/arm/mach-omap2/board-omap3beagle-camera.h new file mode 100644 index 0000000..1026aeb --- /dev/null +++ b/arch/arm/mach-omap2/board-omap3beagle-camera.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2010 Texas Instruments Inc + * Author: Sergio Aguirre + * + * Based on work done by: + * Vaibhav Hiremath + * Anuj Aggarwal + * Sivaraj R + * + * This package 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. + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifndef __BOARD_OMAP3BEAGLE_LMB_H_ +#define __BOARD_OMAP3BEAGLE_LMB_H_ + +/* mux id to enable/disable signal routing to different peripherals */ +enum omap3beaglelmb_mux { + MUX_TVP5146 = 0, + MUX_CAMERA_SENSOR, + MUX_EXP_CAMERA_SENSOR, + NUM_MUX +}; + +/* enum to enable or disable mux */ +enum config_mux { + DISABLE_MUX, + ENABLE_MUX +}; + +#endif /* __BOARD_OMAP3BEAGLE_LMB_H_ */ diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index b313350..d6b69a6 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -712,6 +712,31 @@ static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = { #ifdef CONFIG_OMAP_MUX static struct omap_board_mux board_mux[] __initdata = { + /* Camera - Parallel Data */ + OMAP3_MUX(CAM_D0, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_D1, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_D2, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_D3, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_D4, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_D5, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_D6, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_D7, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_D8, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_D9, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_D10, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_D11, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_PCLK, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + + /* Camera - HS/VS signals */ + OMAP3_MUX(CAM_HS, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + OMAP3_MUX(CAM_VS, OMAP_MUX_MODE0 | OMAP_PIN_INPUT), + + /* Camera - Reset GPIO 98 */ + OMAP3_MUX(CAM_FLD, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT), + + /* Camera - XCLK */ + OMAP3_MUX(CAM_XCLKA, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT), + { .reg_offset = OMAP_MUX_TERMINATOR }, }; #else -- 1.6.6.1