Hello, Vaibhav
May i tell few suggestions ?
On Fri, 2009-01-30 at 00:52 +0530, hvaib...@ti.com wrote:
> From: Vaibhav Hiremath <hvaib...@ti.com>
>
> This is second version of OMAP3EVM Mulit-Media/Mass Market
> Daughter Card support.
>
> Fixes:
> - Cleaned unused header files, struct formating, and unused
> comments.
> - Pad/mux configuration handled in mux.ch
> - mux.ch related changes moved to seperate patch
> - Renamed file board-omap3evm-dc.c to board-omap3evm-dc-v4l.c
> to make more explicit.
> - Added some more meaningful name for Kconfig option
>
> TODO:
> - Camera sensor support (for future development).
> - Driver header file inclusion (dependency on ISP-Camera patches)
> I am working with Sergio to seperate/move header file to standard
> location.
> - Still need to fix naming convention for DC
>
> Tested:
> - TVP5146 (BT656) decoder interface on top of
> Sergio's ISP-Camera patches.
> - Loopback application, capturing image through TVP5146
> and saving it to file per frame.
> - Basic functionality of HSUSB Transceiver USB-83320
>
> Signed-off-by: Brijesh Jadav <brijes...@ti.com>
> Signed-off-by: Hardik Shah <hardik.s...@ti.com>
> Signed-off-by: Vaibhav Hiremath <hvaib...@ti.com>
> ---
> arch/arm/mach-omap2/Kconfig | 8 +-
> arch/arm/mach-omap2/Makefile | 1 +
> arch/arm/mach-omap2/board-omap3evm-dc-v4l.c | 348
> +++++++++++++++++++++++++++
> arch/arm/mach-omap2/board-omap3evm-dc.h | 42 ++++
> 4 files changed, 398 insertions(+), 1 deletions(-)
> create mode 100644 arch/arm/mach-omap2/board-omap3evm-dc-v4l.c
> create mode 100644 arch/arm/mach-omap2/board-omap3evm-dc.h
>
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 8fa650d..c1cf770 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -113,7 +113,7 @@ config MACH_OMAP_LDP
> bool "OMAP3 LDP board"
> depends on ARCH_OMAP3 && ARCH_OMAP34XX
>
> -config MACH_OMAP2EVM
> +config MACH_OMAP2EVM
> bool "OMAP 2530 EVM board"
> depends on ARCH_OMAP2 && ARCH_OMAP24XX
>
> @@ -125,6 +125,12 @@ config MACH_OMAP3EVM
> bool "OMAP 3530 EVM board"
> depends on ARCH_OMAP3 && ARCH_OMAP34XX
>
> +config MACH_OMAP3EVM_MMDC
> + bool "OMAP 3530 EVM Mass Market Daughter Card board"
> + depends on MACH_OMAP3EVM
> + help
> + Set this if you've got a Mass Market Daughter Card board.
> +
> config MACH_OMAP3_BEAGLE
> bool "OMAP3 BEAGLE board"
> depends on ARCH_OMAP3 && ARCH_OMAP34XX
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index 631166d..45f52ca 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -58,6 +58,7 @@ obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \
> usb-musb.o usb-ehci.o \
> board-omap3evm-flash.o \
> twl4030-generic-scripts.o
> +obj-$(CONFIG_MACH_OMAP3EVM_MMDC) += board-omap3evm-dc-v4l.o
> obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \
> usb-musb.o usb-ehci.o \
> mmc-twl4030.o \
> diff --git a/arch/arm/mach-omap2/board-omap3evm-dc-v4l.c
> b/arch/arm/mach-omap2/board-omap3evm-dc-v4l.c
> new file mode 100644
> index 0000000..a7b785e
> --- /dev/null
> +++ b/arch/arm/mach-omap2/board-omap3evm-dc-v4l.c
> @@ -0,0 +1,348 @@
> +/*
> + * arch/arm/mach-omap2/board-omap3evm-dc-v4l.c
> + *
> + * Driver for OMAP3 EVM Mass Market Daughter Card
> + *
> + * Copyright (C) 2008 Texas Instruments Inc
> + * Author: Vaibhav Hiremath <hvaib...@ti.com>
> + *
> + * Contributors:
> + * Anuj Aggarwal <anuj.aggar...@ti.com>
> + * Sivaraj R <siva...@ti.com>
> + *
> + * 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 <linux/init.h>
> +#include <linux/i2c.h>
> +#include <linux/gpio.h>
> +#include <linux/videodev2.h>
> +
> +#include <mach/mux.h>
> +
> +#include <media/v4l2-int-device.h>
> +#include <media/tvp514x.h>
> +
> +/* Include V4L2 ISP-Camera driver related header file */
> +#include <../drivers/media/video/omap34xxcam.h>
> +#include <../drivers/media/video/isp/ispreg.h>
> +
> +#include "board-omap3evm-dc.h"
> +
> +#define MODULE_NAME "omap3evmdc"
> +
> +/* Macro Definitions */
> +
> +/* GPIO pins */
> +#define GPIO134_SEL_TVP_Y (134)
> +#define GPIO54_SEL_EXP_CAM (54)
> +#define GPIO136_SEL_CAM (136)
> +
> +/* board internal information (BEGIN) */
> +
> +/* I2C bus to which all I2C slave devices are attached */
> +#define BOARD_I2C_BUSNUM (3)
> +
> +/* I2C address of chips present in board */
> +#define TVP5146_I2C_ADDR (0x5D)
> +
> +#if defined(CONFIG_VIDEO_TVP514X) || defined(CONFIG_VIDEO_TVP514X_MODULE)
> +#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE)
> +static struct omap34xxcam_hw_config decoder_hwc = {
> + .dev_index = 0,
> + .dev_minor = 0,
> + .dev_type = OMAP34XXCAM_SLAVE_SENSOR,
> + .u.sensor.xclk = OMAP34XXCAM_XCLK_NONE,
> + .u.sensor.sensor_isp = 1,
> +};
> +
> +static struct isp_interface_config tvp5146_if_config = {
> + .ccdc_par_ser = ISP_PARLL_YUV_BT,
> + .dataline_shift = 0x1,
> + .hsvs_syncdetect = ISPCTRL_SYNC_DETECT_VSRISE,
> + .vdint0_timing = 0x0,
> + .vdint1_timing = 0x0,
> + .strobe = 0x0,
> + .prestrobe = 0x0,
> + .shutter = 0x0,
> + .u.par.par_bridge = 0x0,
> + .u.par.par_clk_pol = 0x0,
> +};
> +#endif
> +
> +static struct v4l2_ifparm ifparm = {
> + .if_type = V4L2_IF_TYPE_BT656,
> + .u = {
> + .bt656 = {
> + .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 */
> + .mode =
> V4L2_IF_TYPE_BT656_MODE_BT_8BIT,
> + .clock_min = TVP514X_XCLK_BT656,
> + .clock_max = TVP514X_XCLK_BT656,
> + },
> + },
> +};
> +
> +/**
> + * @brief tvp5146_ifparm - Returns the TVP5146 decoder interface parameters
> + *
> + * @param p - pointer to v4l2_ifparm structure
> + *
> + * @return result of operation - 0 is success
> + */
> +static int tvp5146_ifparm(struct v4l2_ifparm *p)
> +{
> + if (p == NULL)
> + return -EINVAL;
> +
> + *p = ifparm;
> + return 0;
> +}
> +
> +/**
> + * @brief tvp5146_set_prv_data - Returns tvp5146 omap34xx driver private data
> + *
> + * @param priv - pointer to omap34xxcam_hw_config structure
> + *
> + * @return result of operation - 0 is success
> + */
> +static int tvp5146_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.sensor_isp = decoder_hwc.u.sensor.sensor_isp;
> + hwc->u.sensor.xclk = decoder_hwc.u.sensor.xclk;
> + hwc->dev_index = decoder_hwc.dev_index;
> + hwc->dev_minor = decoder_hwc.dev_minor;
> + hwc->dev_type = decoder_hwc.dev_type;
> + return 0;
> +#else
> + return -EINVAL;
> +#endif
> +}
> +
> +/**
> + * @brief omap3evmdc_set_mux - Sets mux to enable/disable signal routing to
> + * different peripherals present in board
> + * IMPORTANT - This function will take care of writing appropriate values for
> + * active low signals as well
> + *
> + * @param mux_id - enum, mux id to enable/disable
> + * @param value - enum, ENABLE_MUX for enabling and DISABLE_MUX for disabling
> + *
> + * @return result of operation - 0 is success
> + */
> +static int omap3evmdc_set_mux(enum omap3evmdc_mux mux_id, enum config_mux
> value)
> +{
> + int err = 0;
> +
> + if (unlikely(mux_id >= NUM_MUX)) {
> + printk(KERN_ERR MODULE_NAME ": Invalid mux id\n");
> + return -EPERM;
> + }
> +
> + switch (mux_id) {
> + case MUX_TVP5146:
> + if (ENABLE_MUX == value) {
> + /* Enable TVP5146 Video in (GPIO134 = 0) */
> + gpio_set_value(GPIO134_SEL_TVP_Y, 0);
> + /* Disable Expansion Camera Video in (GPIO54 = 1) */
> + gpio_set_value(GPIO54_SEL_EXP_CAM, 1);
> + /* Disable Camera Video in (GPIO136 = 1)*/
> + gpio_set_value(GPIO136_SEL_CAM, 1);
> + } else {
> + /* Disable TVP5146 Video in (GPIO134 = 0) */
> + gpio_set_value(GPIO134_SEL_TVP_Y, 1);
> + }
> + break;
> +
> + case MUX_CAMERA_SENSOR:
> + if (ENABLE_MUX == value) {
> + /* Disable TVP5146 Video in (GPIO134 = 0) */
> + gpio_set_value(GPIO134_SEL_TVP_Y, 1);
> + /* Disable Exapansion Camera Video in (GPIO54 = 1) */
> + gpio_set_value(GPIO54_SEL_EXP_CAM, 1);
> + /* Enable Camera Video in (GPIO136 = 1) */
> + gpio_set_value(GPIO136_SEL_CAM, 0);
> + } else {
> + /* Disable Camera Video in (GPIO136 = 1) */
> + gpio_set_value(GPIO136_SEL_CAM, 1);
> + }
> + break;
> +
> + case MUX_EXP_CAMERA_SENSOR:
> + if (ENABLE_MUX == value) {
> + /* Disable TVP5146 Video in (GPIO134 = 0) */
> + gpio_set_value(GPIO134_SEL_TVP_Y, 1);
> + /* Enable Expansion Camera Video in (GPIO54 = 1) */
> + gpio_set_value(GPIO54_SEL_EXP_CAM, 0);
> + /* Disable Camera Video in (GPIO136 = 1) */
> + gpio_set_value(GPIO136_SEL_CAM, 1);
> + } else {
> + /* Disable Expansion Camera Video in (GPIO54 = 1) */
> + gpio_set_value(GPIO54_SEL_EXP_CAM, 1);
> + }
> + break;
> +
> + case NUM_MUX:
> + default:
> + printk(KERN_ERR "Invalid mux id\n");
May be it's better to add MODULE_NAME here? To provide more comfortable
information to dmesg.
> + err = -EPERM;
> + }
> +
> + return err;
> +}
> +/**
> + * @brief tvp5146_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 tvp5146_power_set(enum v4l2_power power)
> +{
> + switch (power) {
> + case V4L2_POWER_OFF:
> +#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE)
> + if (isp_free_interface(ISP_PARLL_YUV_BT))
> + return -ENODEV;
> +#endif
> + /* Disable mux for TVP5146 decoder data path */
> + if (omap3evmdc_set_mux(MUX_TVP5146, DISABLE_MUX))
> + return -ENODEV;
> + break;
> +
> + case V4L2_POWER_STANDBY:
> + break;
> +
> + case V4L2_POWER_ON:
> + /* Enable mux for TVP5146 decoder data path */
> + if (omap3evmdc_set_mux(MUX_TVP5146, ENABLE_MUX))
> + return -ENODEV;
> +
> +#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE)
> + if (isp_request_interface(ISP_PARLL_YUV_BT))
> + return -ENODEV;
> +
> + isp_configure_interface(&tvp5146_if_config);
> +#endif
> + break;
> +
> + default:
> + return -ENODEV;
> + break;
> + }
> + return 0;
> +}
> +
> +static struct tvp514x_platform_data tvp5146_pdata = {
> + .master = "omap34xxcam",
> + .power_set = tvp5146_power_set,
> + .priv_data_set = tvp5146_set_prv_data,
> + .ifparm = tvp5146_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 tvp5146_i2c_board_info = {
> + I2C_BOARD_INFO("tvp5146m2", TVP5146_I2C_ADDR),
> + .platform_data = &tvp5146_pdata,
> +};
> +
> +#endif /* #ifdef CONFIG_VIDEO_TVP514X */
> +
> +/**
> + * @brief omap3evmdc_mdc_config - GPIO configuration for
> + * GPIO 134, 54 and 136
> + *
> + * @return result of operation - 0 is success
> + */
> +static int omap3evmdc_mdc_config(void)
> +{
> + /* Setting the MUX configuration */
> + omap_cfg_reg(AG4_34XX_GPIO134);
> + omap_cfg_reg(U8_34XX_GPIO54);
> + omap_cfg_reg(AE4_34XX_GPIO136);
> +
> + if (gpio_request(GPIO134_SEL_TVP_Y, "TVP5146 Vid-in") < 0) {
> + printk(KERN_ERR MODULE_NAME ": Can't get GPIO 134\n");
> + return -EINVAL;
> + }
> +
> + if (gpio_request(GPIO54_SEL_EXP_CAM, "EXP_CAM Vid-in") < 0) {
> + printk(KERN_ERR MODULE_NAME ": Can't get GPIO 54\n");
> + return -EINVAL;
> + }
> +
> + if (gpio_request(GPIO136_SEL_CAM, "CAM Vid-in") < 0) {
> + printk(KERN_ERR MODULE_NAME ": Can't get GPIO 136\n");
> + return -EINVAL;
> + }
It's not really important..
If i'm not wrong gpio_request can return -EBUSY and -EINVAL. May be it's
better to introduce retval variable, call to gpio_request, check retval
value and provide error number to printk-message and and return retval.
But it's your decision.
> +
> + /* Make GPIO as output */
> + gpio_direction_output(GPIO134_SEL_TVP_Y, 0);
> + gpio_direction_output(GPIO54_SEL_EXP_CAM, 0);
> + gpio_direction_output(GPIO136_SEL_CAM, 0);
> +
> + return 0;
> +}
> +
> +/**
> + * @brief omap3evmdc_init - module init function. Should be called before any
> + * client driver init call
> + *
> + * @return result of operation - 0 is success
> + */
> +static int __init omap3evmdc_init(void)
> +{
> + int err;
> +
> + err = omap3evmdc_mdc_config();
> + if (err) {
> + printk(KERN_ERR MODULE_NAME ": MDC configuration failed \n");
> + return 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_TVP514X) || defined(CONFIG_VIDEO_TVP514X_MODULE)
> + err = i2c_register_board_info(BOARD_I2C_BUSNUM,
> + &tvp5146_i2c_board_info, 1);
> + if (err) {
> + printk(KERN_ERR MODULE_NAME \
Do you really need slash here? Probably, you can remove it :)
> + ": TVP5146 I2C Board Registration failed \n");
> + return err;
> + }
> +#endif
> + printk(KERN_INFO MODULE_NAME ": Driver registration complete \n");
> +
> + return 0;
> +}
> +
> +arch_initcall(omap3evmdc_init);
> diff --git a/arch/arm/mach-omap2/board-omap3evm-dc.h
> b/arch/arm/mach-omap2/board-omap3evm-dc.h
> new file mode 100644
> index 0000000..599d8a6
> --- /dev/null
> +++ b/arch/arm/mach-omap2/board-omap3evm-dc.h
> @@ -0,0 +1,42 @@
> +/*
> + * arch/arm/mach-omap2/board-omap3evm-dc.h
> + *
> + * Copyright (C) 2008 Texas Instruments Inc
> + * Author: Vaibhav Hiremath <hvaib...@ti.com>
> + *
> + * Contributors:
> + * Anuj Aggarwal <anuj.aggar...@ti.com>
> + * Sivaraj R <siva...@ti.com>
> + *
> + * 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_OMAP3EVM_DC_H_
> +#define __BOARD_OMAP3EVM_DC_H_
> +
> +/* mux id to enable/disable signal routing to different peripherals */
> +enum omap3evmdc_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_OMAP3EVM_DC_H_ */
> --
> 1.5.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Best regards, Klimov Alexey
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
