From patchwork Thu Dec 1 00:14:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aguirre Rodriguez, Sergio Alberto" X-Patchwork-Id: 8684 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RVuJN-0006xp-Iy; Thu, 01 Dec 2011 01:15:38 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp id 1RVuJL-00016K-Cf; Thu, 01 Dec 2011 01:15:37 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753296Ab1LAAP1 (ORCPT + 4 others); Wed, 30 Nov 2011 19:15:27 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:37099 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753228Ab1LAAPS (ORCPT ); Wed, 30 Nov 2011 19:15:18 -0500 Received: from dlep34.itg.ti.com ([157.170.170.115]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id pB10F5cd004188 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 30 Nov 2011 18:15:06 -0600 Received: from dlep26.itg.ti.com (smtp-le.itg.ti.com [157.170.170.27]) by dlep34.itg.ti.com (8.13.7/8.13.8) with ESMTP id pB10F5sU002658; Wed, 30 Nov 2011 18:15:05 -0600 (CST) Received: from DFLE70.ent.ti.com (localhost [127.0.0.1]) by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id pB10F5vU029637; Wed, 30 Nov 2011 18:15:05 -0600 (CST) Received: from dlelxv24.itg.ti.com (172.17.1.199) by dfle70.ent.ti.com (128.247.5.40) with Microsoft SMTP Server id 14.1.323.3; Wed, 30 Nov 2011 18:15:05 -0600 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id pB10F5Kn027260; Wed, 30 Nov 2011 18:15:05 -0600 Received: from localhost (dtx0091359-ubuntu-2.am.dhcp.ti.com [10.247.19.253]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id pB10F4028942; Wed, 30 Nov 2011 18:15:04 -0600 (CST) From: Sergio Aguirre To: CC: , , , Sergio Aguirre Subject: [PATCH v2 08/11] v4l: Add support for ov5650 sensor Date: Wed, 30 Nov 2011 18:14:57 -0600 Message-ID: <1322698500-29924-9-git-send-email-saaguirre@ti.com> X-Mailer: git-send-email 1.7.7.4 In-Reply-To: <1322698500-29924-1-git-send-email-saaguirre@ti.com> References: <1322698500-29924-1-git-send-email-saaguirre@ti.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.12.1.319 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, MSGID_ADDED_BY_MTA 0.05, BODY_SIZE_10000_PLUS 0, DATE_TZ_NA 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __STOCK_PHRASE_7 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NS ' X-LSpam-Score: -6.9 (------) X-LSpam-Report: No, score=-6.9 required=5.0 tests=BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5 autolearn=ham Signed-off-by: Sergio Aguirre --- drivers/media/video/Kconfig | 6 + drivers/media/video/Makefile | 1 + drivers/media/video/ov5650.c | 524 +++++++++++++++++++++++++++++++++++++++ include/media/ov5650.h | 10 + include/media/v4l2-chip-ident.h | 1 + 5 files changed, 542 insertions(+), 0 deletions(-) create mode 100644 drivers/media/video/ov5650.c create mode 100644 include/media/ov5650.h diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 3ee4fc9..46076a9 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -473,6 +473,12 @@ config VIDEO_OV5640 help This is a ov5640 camera driver +config VIDEO_OV5650 + tristate "OmniVision OV5650 sensor support" + depends on I2C && VIDEO_V4L2 + help + This is a ov5650 camera driver + config VIDEO_MT9P031 tristate "Aptina MT9P031 support" depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index d296c7b..9061cfc 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -64,6 +64,7 @@ obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o obj-$(CONFIG_VIDEO_OV7670) += ov7670.o obj-$(CONFIG_VIDEO_OV5640) += ov5640.o +obj-$(CONFIG_VIDEO_OV5650) += ov5650.o obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o diff --git a/drivers/media/video/ov5650.c b/drivers/media/video/ov5650.c new file mode 100644 index 0000000..092d8bf --- /dev/null +++ b/drivers/media/video/ov5650.c @@ -0,0 +1,524 @@ +/* + * OmniVision OV5650 sensor driver + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + * + * 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 version 2. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +/* OV5650 has only one fixed colorspace per pixelcode */ +struct ov5650_datafmt { + enum v4l2_mbus_pixelcode code; + enum v4l2_colorspace colorspace; +}; + +enum ov5650_size { + OV5650_SIZE_5MP, + OV5650_SIZE_LAST, +}; + +static const struct v4l2_frmsize_discrete ov5650_frmsizes[OV5650_SIZE_LAST] = { + { 2592, 1944 }, +}; + +struct ov5650 { + struct v4l2_subdev subdev; + struct media_pad pad; + + struct v4l2_mbus_framefmt format; + + const struct ov5650_platform_data *pdata; +}; + +static inline struct ov5650 *to_ov5650(struct v4l2_subdev *sd) +{ + return container_of(sd, struct ov5650, subdev); +} + +/** + * struct ov5650_reg - ov5650 register format + * @reg: 16-bit offset to register + * @val: 8/16/32-bit register value + * @length: length of the register + * + * Define a structure for OV5650 register initialization values + */ +struct ov5650_reg { + u16 reg; + u8 val; +}; + +/* TODO: Divide this properly */ +static const struct ov5650_reg configscript_5MP[] = { + { 0x3008, 0x82 }, + { 0x3008, 0x42 }, + { 0x3103, 0x93 }, + { 0x3b07, 0x0c }, + { 0x3017, 0xff }, + { 0x3018, 0xfc }, + { 0x3706, 0x41 }, + { 0x3703, 0xe6 }, + { 0x3613, 0x44 }, + { 0x3630, 0x22 }, + { 0x3605, 0x04 }, + { 0x3606, 0x3f }, + { 0x3712, 0x13 }, + { 0x370e, 0x00 }, + { 0x370b, 0x40 }, + { 0x3600, 0x54 }, + { 0x3601, 0x05 }, + { 0x3713, 0x22 }, + { 0x3714, 0x27 }, + { 0x3631, 0x22 }, + { 0x3612, 0x1a }, + { 0x3604, 0x40 }, + { 0x3705, 0xda }, + { 0x370a, 0x80 }, + { 0x370c, 0x00 }, + { 0x3710, 0x28 }, + { 0x3702, 0x3a }, + { 0x3704, 0x18 }, + { 0x3a18, 0x00 }, + { 0x3a19, 0xf8 }, + { 0x3a00, 0x38 }, + { 0x3800, 0x02 }, + { 0x3801, 0x54 }, + { 0x3803, 0x0c }, + { 0x3808, 0x0a }, + { 0x3809, 0x20 }, + { 0x380a, 0x07 }, + { 0x380b, 0x98 }, + { 0x380c, 0x0c }, + { 0x380d, 0xb4 }, + { 0x380e, 0x07 }, + { 0x380f, 0xb0 }, + { 0x3830, 0x50 }, + { 0x3a08, 0x12 }, + { 0x3a09, 0x70 }, + { 0x3a0a, 0x0f }, + { 0x3a0b, 0x60 }, + { 0x3a0d, 0x06 }, + { 0x3a0e, 0x06 }, + { 0x3a13, 0x54 }, + { 0x3815, 0x82 }, + { 0x5059, 0x80 }, + { 0x505a, 0x0a }, + { 0x505b, 0x2e }, + { 0x3a1a, 0x06 }, + { 0x3503, 0x00 }, + { 0x3623, 0x01 }, + { 0x3633, 0x24 }, + { 0x3c01, 0x34 }, + { 0x3c04, 0x28 }, + { 0x3c05, 0x98 }, + { 0x3c07, 0x07 }, + { 0x3c09, 0xc2 }, + { 0x4000, 0x05 }, + { 0x401d, 0x28 }, + { 0x4001, 0x02 }, + { 0x401c, 0x46 }, + { 0x5046, 0x01 }, + { 0x3810, 0x40 }, + { 0x3836, 0x41 }, + { 0x505f, 0x04 }, + { 0x5000, 0x00 }, + { 0x5001, 0x00 }, + { 0x5002, 0x00 }, + { 0x503d, 0x00 }, + { 0x5901, 0x00 }, + { 0x585a, 0x01 }, + { 0x585b, 0x2c }, + { 0x585c, 0x01 }, + { 0x585d, 0x93 }, + { 0x585e, 0x01 }, + { 0x585f, 0x90 }, + { 0x5860, 0x01 }, + { 0x5861, 0x0d }, + { 0x5180, 0xc0 }, + { 0x5184, 0x00 }, + { 0x470a, 0x00 }, + { 0x470b, 0x00 }, + { 0x470c, 0x00 }, + { 0x300f, 0x8e }, + { 0x3603, 0xa7 }, + { 0x3615, 0x50 }, + { 0x3632, 0x55 }, + { 0x3620, 0x56 }, + { 0x3621, 0x2f }, + { 0x381a, 0x3c }, + { 0x3818, 0xc0 }, + { 0x3631, 0x36 }, + { 0x3632, 0x5f }, + { 0x3711, 0x24 }, + { 0x401f, 0x03 }, + { 0x3011, 0x14 }, + { 0x3007, 0x3b }, + { 0x4801, 0x0f }, + { 0x3003, 0x03 }, + { 0x300e, 0x0c }, + { 0x4803, 0x50 }, + { 0x4800, 0x04 }, + { 0x300f, 0x8f }, + { 0x3815, 0x82 }, + { 0x3003, 0x01 }, + { 0x3008, 0x02 }, +}; + +/** + * ov5650_reg_read - Read a value from a register in an ov5650 sensor device + * @client: i2c driver client structure + * @reg: register address / offset + * @val: stores the value that gets read + * + * Read a value from a register in an ov5650 sensor device. + * The value is returned in 'val'. + * Returns zero if successful, or non-zero otherwise. + */ +static int ov5650_reg_read(struct i2c_client *client, u16 reg, u8 *val) +{ + int ret; + u8 data[2] = {0}; + struct i2c_msg msg = { + .addr = client->addr, + .flags = 0, + .len = 2, + .buf = data, + }; + + data[0] = (u8)(reg >> 8); + data[1] = (u8)(reg & 0xff); + + ret = i2c_transfer(client->adapter, &msg, 1); + if (ret < 0) + goto err; + + msg.flags = I2C_M_RD; + msg.len = 1; + ret = i2c_transfer(client->adapter, &msg, 1); + if (ret < 0) + goto err; + + *val = data[0]; + return 0; + +err: + dev_err(&client->dev, "Failed reading register 0x%02x!\n", reg); + return ret; +} + +/** + * Write a value to a register in ov5650 sensor device. + * @client: i2c driver client structure. + * @reg: Address of the register to read value from. + * @val: Value to be written to a specific register. + * Returns zero if successful, or non-zero otherwise. + */ +static int ov5650_reg_write(struct i2c_client *client, u16 reg, u8 val) +{ + int ret; + unsigned char data[3] = { (u8)(reg >> 8), (u8)(reg & 0xff), val }; + struct i2c_msg msg = { + .addr = client->addr, + .flags = 0, + .len = 3, + .buf = data, + }; + + ret = i2c_transfer(client->adapter, &msg, 1); + if (ret < 0) { + dev_err(&client->dev, "Failed writing register 0x%02x!\n", reg); + return ret; + } + + return 0; +} + +/** + * Initialize a list of ov5650 registers. + * The list of registers is terminated by the pair of values + * @client: i2c driver client structure. + * @reglist[]: List of address of the registers to write data. + * Returns zero if successful, or non-zero otherwise. + */ +static int ov5650_reg_writes(struct i2c_client *client, + const struct ov5650_reg reglist[], + int size) +{ + int err = 0, i; + + for (i = 0; i < size; i++) { + err = ov5650_reg_write(client, reglist[i].reg, + reglist[i].val); + if (err) + return err; + } + return 0; +} + +static struct v4l2_mbus_framefmt * +__ov5650_get_pad_format(struct ov5650 *ov5650, struct v4l2_subdev_fh *fh, + unsigned int pad, enum v4l2_subdev_format_whence which) +{ + switch (which) { + case V4L2_SUBDEV_FORMAT_TRY: + return v4l2_subdev_get_try_format(fh, pad); + case V4L2_SUBDEV_FORMAT_ACTIVE: + return &ov5650->format; + default: + return NULL; + } +} + +/* ----------------------------------------------------------------------------- + * V4L2 subdev internal operations + */ + +static int ov5650_s_power(struct v4l2_subdev *sd, int on) +{ + struct ov5650 *ov5650 = to_ov5650(sd); + + return ov5650->pdata->s_power(sd, on); +} + +static int ov5650_registered(struct v4l2_subdev *subdev) +{ + struct i2c_client *client = v4l2_get_subdevdata(subdev); + int ret = 0; + u8 revision = 0; + + ret = ov5650_s_power(subdev, 1); + if (ret < 0) { + dev_err(&client->dev, "OV5650 power up failed\n"); + return ret; + } + + ret = ov5650_reg_read(client, 0x302A, &revision); + if (ret) { + dev_err(&client->dev, "Failure to detect OV5650 chip\n"); + goto out; + } + + revision &= 0xF; + + dev_info(&client->dev, "Detected a OV5650 chip, revision %x\n", + revision); + +out: + ov5650_s_power(subdev, 0); + + return ret; +} + +static int ov5650_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) +{ + struct v4l2_mbus_framefmt *format; + + format = v4l2_subdev_get_try_format(fh, 0); + format->code = V4L2_MBUS_FMT_SGRBG10_1X10; + format->width = ov5650_frmsizes[OV5650_SIZE_5MP].width; + format->height = ov5650_frmsizes[OV5650_SIZE_5MP].height; + format->field = V4L2_FIELD_NONE; + format->colorspace = V4L2_COLORSPACE_SRGB; + + return 0; +} + +static int ov5650_close(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) +{ + return 0; +} + +static int ov5650_s_stream(struct v4l2_subdev *sd, int enable) +{ + struct i2c_client *client = v4l2_get_subdevdata(sd); + int ret = 0; + + if (enable) { + /* HACK: Hardcoding to 5MP! */ + ret = ov5650_reg_writes(client, configscript_5MP, + ARRAY_SIZE(configscript_5MP)); + } + + return ret; +} + +static int ov5650_g_fmt(struct v4l2_subdev *sd, + struct v4l2_subdev_fh *fh, + struct v4l2_subdev_format *format) +{ + struct ov5650 *ov5650 = to_ov5650(sd); + + format->format = *__ov5650_get_pad_format(ov5650, fh, format->pad, + format->which); + + return 0; +} + +static int ov5650_s_fmt(struct v4l2_subdev *sd, + struct v4l2_subdev_fh *fh, + struct v4l2_subdev_format *format) +{ + struct ov5650 *ov5650 = to_ov5650(sd); + struct v4l2_mbus_framefmt *__format; + + __format = __ov5650_get_pad_format(ov5650, fh, format->pad, + format->which); + + /* FIXME: Do an actual change! */ + format->format = *__format; + + return 0; +} + +static struct v4l2_subdev_internal_ops ov5650_subdev_internal_ops = { + .registered = ov5650_registered, + .open = ov5650_open, + .close = ov5650_close, +}; + +static int ov5650_enum_fmt(struct v4l2_subdev *subdev, + struct v4l2_subdev_fh *fh, + struct v4l2_subdev_mbus_code_enum *code) +{ + if (code->index > 0) + return -EINVAL; + + code->code = V4L2_MBUS_FMT_SGRBG10_1X10; + return 0; +} + +static int ov5650_enum_framesizes(struct v4l2_subdev *subdev, + struct v4l2_subdev_fh *fh, + struct v4l2_subdev_frame_size_enum *fse) +{ + if (fse->index >= 1 || fse->code != V4L2_MBUS_FMT_SGRBG10_1X10) + return -EINVAL; + + fse->min_width = ov5650_frmsizes[fse->index].width; + fse->max_width = fse->min_width; + fse->min_height = ov5650_frmsizes[fse->index].height; + fse->max_height = fse->min_height; + + return 0; +} + +static struct v4l2_subdev_core_ops ov5650_subdev_core_ops = { + .s_power = ov5650_s_power, +}; + +static struct v4l2_subdev_video_ops ov5650_subdev_video_ops = { + .s_stream = ov5650_s_stream, +}; + +static struct v4l2_subdev_pad_ops ov5650_subdev_pad_ops = { + .enum_mbus_code = ov5650_enum_fmt, + .enum_frame_size = ov5650_enum_framesizes, + .get_fmt = ov5650_g_fmt, + .set_fmt = ov5650_s_fmt, +}; + +static struct v4l2_subdev_ops ov5650_subdev_ops = { + .core = &ov5650_subdev_core_ops, + .video = &ov5650_subdev_video_ops, + .pad = &ov5650_subdev_pad_ops, +}; + +static int ov5650_probe(struct i2c_client *client, + const struct i2c_device_id *did) +{ + struct ov5650 *ov5650; + int ret; + + if (!client->dev.platform_data) { + dev_err(&client->dev, "No platform data!!\n"); + return -ENODEV; + } + + ov5650 = kzalloc(sizeof(*ov5650), GFP_KERNEL); + if (!ov5650) + return -ENOMEM; + + ov5650->pdata = client->dev.platform_data; + + ov5650->format.code = V4L2_MBUS_FMT_SGRBG10_1X10; + ov5650->format.width = ov5650_frmsizes[OV5650_SIZE_5MP].width; + ov5650->format.height = ov5650_frmsizes[OV5650_SIZE_5MP].height; + ov5650->format.field = V4L2_FIELD_NONE; + ov5650->format.colorspace = V4L2_COLORSPACE_SRGB; + + v4l2_i2c_subdev_init(&ov5650->subdev, client, &ov5650_subdev_ops); + ov5650->subdev.internal_ops = &ov5650_subdev_internal_ops; + ov5650->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; + + ov5650->pad.flags = MEDIA_PAD_FL_SOURCE; + ret = media_entity_init(&ov5650->subdev.entity, 1, &ov5650->pad, 0); + + if (ret < 0) { + media_entity_cleanup(&ov5650->subdev.entity); + kfree(ov5650); + } + + return ret; +} + +static int ov5650_remove(struct i2c_client *client) +{ + struct v4l2_subdev *subdev = i2c_get_clientdata(client); + struct ov5650 *ov5650 = to_ov5650(subdev); + + v4l2_device_unregister_subdev(subdev); + media_entity_cleanup(&subdev->entity); + kfree(ov5650); + return 0; +} + +static const struct i2c_device_id ov5650_id[] = { + { "ov5650", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, ov5650_id); + +static struct i2c_driver ov5650_i2c_driver = { + .driver = { + .name = "ov5650", + }, + .probe = ov5650_probe, + .remove = ov5650_remove, + .id_table = ov5650_id, +}; + +static int __init ov5650_mod_init(void) +{ + return i2c_add_driver(&ov5650_i2c_driver); +} + +static void __exit ov5650_mod_exit(void) +{ + i2c_del_driver(&ov5650_i2c_driver); +} + +module_init(ov5650_mod_init); +module_exit(ov5650_mod_exit); + +MODULE_DESCRIPTION("OmniVision OV5650 Camera driver"); +MODULE_AUTHOR("Sergio Aguirre "); +MODULE_LICENSE("GPL v2"); diff --git a/include/media/ov5650.h b/include/media/ov5650.h new file mode 100644 index 0000000..287f20f --- /dev/null +++ b/include/media/ov5650.h @@ -0,0 +1,10 @@ +#ifndef _MEDIA_OV5650_H +#define _MEDIA_OV5650_H + +#include + +struct ov5650_platform_data { + int (*s_power)(struct v4l2_subdev *subdev, int on); +}; + +#endif diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h index de1d680..f76c8be 100644 --- a/include/media/v4l2-chip-ident.h +++ b/include/media/v4l2-chip-ident.h @@ -78,6 +78,7 @@ enum { V4L2_IDENT_OV9740 = 260, V4L2_IDENT_OV5642 = 261, V4L2_IDENT_OV5640 = 262, + V4L2_IDENT_OV5650 = 263, /* module saa7146: reserved range 300-309 */ V4L2_IDENT_SAA7146 = 300,