soc-camera: Add mt9t112 camera support
Commit Message
Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
---
>> Guennadi
I add new number in v4l2-chip-ident.h
Is it OK for you ?
This camera is very picky.
So, it have a lot of constant value.
The register of mt9t112 and mt9t111 are same.
But I have mt9t112 only.
mt9t111 should also work, but I can not check.
This patch is based on your 20091105 patches.
drivers/media/video/Kconfig | 6 +
drivers/media/video/Makefile | 1 +
drivers/media/video/mt9t112.c | 1158 +++++++++++++++++++++++++++++++++++++++
include/media/mt9t112.h | 32 ++
include/media/v4l2-chip-ident.h | 2 +
5 files changed, 1199 insertions(+), 0 deletions(-)
create mode 100644 drivers/media/video/mt9t112.c
create mode 100644 include/media/mt9t112.h
Comments
Hi,
Please make this a generic driver so that it can be used across
other SoCs as well. BTW, on which SoC have you tested this driver?
There seems to be a lot of soc-camera specific stuffs here.
Example, probe() is getting a pointer to struct soc_camera_device *icd. I have been working with Guennadi to make the MT9T031.c driver work for TI's VPFE on DMxxx SOCs. since this is a new driver, I would like to see it de-coupled from soc-camera framework and implemented as a generic v4l2-subdevice driver.
Thanks and regards.
Murali Karicheri
Software Design Engineer
Texas Instruments Inc.
Germantown, MD 20874
phone: 301-407-9583
email: m-karicheri2@ti.com
>-----Original Message-----
>From: linux-media-owner@vger.kernel.org [mailto:linux-media-
>owner@vger.kernel.org] On Behalf Of Kuninori Morimoto
>Sent: Thursday, November 19, 2009 4:16 AM
>To: Guennadi
>Cc: Linux-V4L2
>Subject: [PATCH] soc-camera: Add mt9t112 camera support
>
>Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
>---
>>> Guennadi
>
>I add new number in v4l2-chip-ident.h
>Is it OK for you ?
>
>This camera is very picky.
>So, it have a lot of constant value.
>
>The register of mt9t112 and mt9t111 are same.
>But I have mt9t112 only.
>mt9t111 should also work, but I can not check.
>
>This patch is based on your 20091105 patches.
>
> drivers/media/video/Kconfig | 6 +
> drivers/media/video/Makefile | 1 +
> drivers/media/video/mt9t112.c | 1158
>+++++++++++++++++++++++++++++++++++++++
> include/media/mt9t112.h | 32 ++
> include/media/v4l2-chip-ident.h | 2 +
> 5 files changed, 1199 insertions(+), 0 deletions(-)
> create mode 100644 drivers/media/video/mt9t112.c
> create mode 100644 include/media/mt9t112.h
>
>diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
>index 0ab7ccd..0aec969 100644
>--- a/drivers/media/video/Kconfig
>+++ b/drivers/media/video/Kconfig
>@@ -840,6 +840,12 @@ config SOC_CAMERA_MT9T031
> help
> This driver supports MT9T031 cameras from Micron.
>
>+config SOC_CAMERA_MT9T112
>+ tristate "mt9t112 support"
>+ depends on SOC_CAMERA && I2C
>+ help
>+ This driver supports MT9T112 cameras from Aptina.
>+
> config SOC_CAMERA_MT9V022
> tristate "mt9v022 support"
> depends on SOC_CAMERA && I2C
>diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
>index 62d8907..b0e27b2 100644
>--- a/drivers/media/video/Makefile
>+++ b/drivers/media/video/Makefile
>@@ -75,6 +75,7 @@ obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o
> obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o
> obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o
> obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o
>+obj-$(CONFIG_SOC_CAMERA_MT9T112) += mt9t112.o
> obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
> obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o
> obj-$(CONFIG_SOC_CAMERA_OV9640) += ov9640.o
>diff --git a/drivers/media/video/mt9t112.c b/drivers/media/video/mt9t112.c
>new file mode 100644
>index 0000000..8ca2128
>--- /dev/null
>+++ b/drivers/media/video/mt9t112.c
>@@ -0,0 +1,1158 @@
>+/*
>+ * mt9t112 Camera Driver
>+ *
>+ * Copyright (C) 2009 Renesas Solutions Corp.
>+ * Kuninori Morimoto <morimoto.kuninori@renesas.com>
>+ *
>+ * Based on ov772x driver, mt9m111 driver,
>+ *
>+ * Copyright (C) 2008 Kuninori Morimoto <morimoto.kuninori@renesas.com>
>+ * Copyright (C) 2008, Robert Jarzmik <robert.jarzmik@free.fr>
>+ * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net>
>+ * Copyright (C) 2008 Magnus Damm
>+ * 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.
>+ */
>+
>+#include <linux/init.h>
>+#include <linux/module.h>
>+#include <linux/i2c.h>
>+#include <linux/slab.h>
>+#include <linux/delay.h>
>+#include <linux/videodev2.h>
>+#include <media/v4l2-chip-ident.h>
>+#include <media/v4l2-common.h>
>+#include <media/soc_camera.h>
>+#include <media/mt9t112.h>
>+
>+/* you can check PLL/clock info */
>+/* #define EXT_CLOCK 24000000 */
>+
>+/************************************************************************
>+
>+
>+ macro
>+
>+
>+************************************************************************/
>+/*
>+ * frame size
>+ */
>+#define MAX_WIDTH 2048
>+#define MAX_HEIGHT 1536
>+
>+#define VGA_WIDTH 640
>+#define VGA_HEIGHT 480
>+
>+/*
>+ * macro of read/write
>+ */
>+#define ECHECKER(x) \
>+ do { \
>+ ret = x; \
>+ if (ret < 0) \
>+ return ret; \
>+ } while (0)
>+
>+#define mt9t112_reg_write(a, b) ECHECKER(__mt9t112_reg_write(client, a,
>b))
>+#define mt9t112_mcu_write(a, b) ECHECKER(__mt9t112_mcu_write(client, a,
>b))
>+
>+#define mt9t112_reg_mask_set(a, b, c)\
>+ ECHECKER(__mt9t112_reg_mask_set(client, a, b, c))
>+#define mt9t112_mcu_mask_set(a, b, c)\
>+ ECHECKER(__mt9t112_mcu_mask_set(client, a, b, c))
>+
>+#define mt9t112_reg_read(a) __mt9t112_reg_read(client, a)
>+#define mt9t112_mcu_read(a) __mt9t112_mcu_read(client, a)
>+
>+/*
>+ * Logical address
>+ */
>+#define _VAR(id, offset, base) (base | (id & 0x1f) << 10 | (offset &
>0x3ff))
>+#define VAR(id, offset) _VAR(id, offset, 0x0000)
>+#define VAR8(id, offset) _VAR(id, offset, 0x8000)
>+
>+/************************************************************************
>+
>+
>+ struct
>+
>+
>+************************************************************************/
>+struct mt9t112_frame_size {
>+ u16 width;
>+ u16 height;
>+};
>+
>+struct mt9t112_format {
>+ const enum v4l2_imgbus_pixelcode code;
>+ u16 fmt;
>+ u16 order;
>+};
>+
>+struct mt9t112_priv {
>+ struct v4l2_subdev subdev;
>+ struct mt9t112_camera_info *info;
>+ struct i2c_client *client;
>+ struct soc_camera_device icd;
>+ struct mt9t112_frame_size frame;
>+ const struct mt9t112_format *format;
>+ int model;
>+ u32 flags;
>+/* for flags */
>+#define INIT_DONE (1<<0)
>+};
>+
>+/************************************************************************
>+
>+
>+ supported format
>+
>+
>+************************************************************************/
>+#define FMT(_code, _fmt, _order) { .code = V4L2_IMGBUS_FMT_ ## _code,\
>+ .fmt = _fmt,\
>+ .order = _order, }
>+static const struct mt9t112_format mt9t112_cfmts[] = {
>+ FMT(UYVY, 0x0001, 0x0000),
>+ FMT(VYUY, 0x0001, 0x0001),
>+ FMT(YUYV, 0x0001, 0x0002),
>+ FMT(YVYU, 0x0001, 0x0003),
>+ FMT(RGB555, 0x0008, 0x0002),
>+ FMT(RGB565, 0x0004, 0x0002),
>+};
>+
>+/************************************************************************
>+
>+
>+ general function
>+
>+
>+************************************************************************/
>+static struct mt9t112_priv *to_mt9t112(const struct i2c_client *client)
>+{
>+ return container_of(i2c_get_clientdata(client),
>+ struct mt9t112_priv,
>+ subdev);
>+}
>+
>+static int __mt9t112_reg_read(const struct i2c_client *client, u16
>command)
>+{
>+ struct i2c_msg msg[2];
>+ u8 buf[2];
>+ int ret;
>+
>+ command = swab16(command);
>+
>+ msg[0].addr = client->addr;
>+ msg[0].flags = 0;
>+ msg[0].len = 2;
>+ msg[0].buf = (u8 *)&command;
>+
>+ msg[1].addr = client->addr;
>+ msg[1].flags = I2C_M_RD;
>+ msg[1].len = 2;
>+ msg[1].buf = buf;
>+
>+ /*
>+ * if return value of this function is < 0,
>+ * it mean error.
>+ * else, under 16bit is valid data.
>+ */
>+ ret = i2c_transfer(client->adapter, msg, 2);
>+ if (ret < 0)
>+ return ret;
>+
>+ memcpy(&ret, buf, 2);
>+ return swab16(ret);
>+}
>+
>+static int __mt9t112_reg_write(const struct i2c_client *client,
>+ u16 command, u16 data)
>+{
>+ struct i2c_msg msg;
>+ u8 buf[4];
>+ int ret;
>+
>+ command = swab16(command);
>+ data = swab16(data);
>+
>+ memcpy(buf + 0, &command, 2);
>+ memcpy(buf + 2, &data, 2);
>+
>+ msg.addr = client->addr;
>+ msg.flags = 0;
>+ msg.len = 4;
>+ msg.buf = buf;
>+
>+ /*
>+ * i2c_transfer return message length,
>+ * but this function should return 0 if correct case
>+ * */
>+ ret = i2c_transfer(client->adapter, &msg, 1);
>+ if (ret >= 0)
>+ ret = 0;
>+
>+ return ret;
>+}
>+
>+static int __mt9t112_reg_mask_set(const struct i2c_client *client,
>+ u16 command,
>+ u16 mask,
>+ u16 set)
>+{
>+ int val = __mt9t112_reg_read(client, command);
>+ if (val < 0)
>+ return val;
>+
>+ val &= ~mask;
>+ val |= set & mask;
>+
>+ return __mt9t112_reg_write(client, command, val);
>+}
>+
>+/* mcu access */
>+static int __mt9t112_mcu_read(const struct i2c_client *client, u16
>command)
>+{
>+ int ret;
>+
>+ ret = __mt9t112_reg_write(client, 0x098E, command);
>+ if (ret < 0)
>+ return ret;
>+
>+ return __mt9t112_reg_read(client, 0x0990);
>+}
>+
>+static int __mt9t112_mcu_write(const struct i2c_client *client,
>+ u16 command, u16 data)
>+{
>+ int ret;
>+
>+ ret = __mt9t112_reg_write(client, 0x098E, command);
>+ if (ret < 0)
>+ return ret;
>+
>+ return __mt9t112_reg_write(client, 0x0990, data);
>+}
>+
>+static int __mt9t112_mcu_mask_set(const struct i2c_client *client,
>+ u16 command,
>+ u16 mask,
>+ u16 set)
>+{
>+ int val = __mt9t112_mcu_read(client, command);
>+ if (val < 0)
>+ return val;
>+
>+ val &= ~mask;
>+ val |= set & mask;
>+
>+ return __mt9t112_mcu_write(client, command, val);
>+}
>+
>+static int mt9t112_reset(const struct i2c_client *client)
>+{
>+ int ret;
>+
>+ mt9t112_reg_mask_set(0x001a, 0x0001, 0x0001);
>+ msleep(1);
>+ mt9t112_reg_mask_set(0x001a, 0x0001, 0x0000);
>+
>+ return ret;
>+}
>+
>+#ifndef EXT_CLOCK
>+#define CLOCK_INFO(a, b)
>+#else
>+#define CLOCK_INFO(a, b) mt9t112_clock_info(a, b)
>+static void mt9t112_clock_info(const struct i2c_client *client, u32 ext)
>+{
>+ int m, n, p1, p2, p3, p4, p5, p6, p7;
>+ u32 vco, clk;
>+ char *enable;
>+
>+ ext /= 1000; /* kbyte order */
>+
>+ n = mt9t112_reg_read(0x0012);
>+ p1 = n & 0x000f;
>+ n = n >> 4;
>+ p2 = n & 0x000f;
>+ n = n >> 4;
>+ p3 = n & 0x000f;
>+
>+ n = mt9t112_reg_read(0x002a);
>+ p4 = n & 0x000f;
>+ n = n >> 4;
>+ p5 = n & 0x000f;
>+ n = n >> 4;
>+ p6 = n & 0x000f;
>+
>+ n = mt9t112_reg_read(0x002c);
>+ p7 = n & 0x000f;
>+
>+ n = mt9t112_reg_read(0x0010);
>+ m = n & 0x00ff;
>+ n = (n >> 8) & 0x003f;
>+
>+ enable = ((6000 > ext) || (54000 < ext)) ? "X" : "";
>+ dev_info(&client->dev, "EXTCLK : %10u K %s\n", ext, enable);
>+
>+ vco = 2 * m * ext / (n+1);
>+ enable = ((384000 > vco) || (768000 < vco)) ? "X" : "";
>+ dev_info(&client->dev, "VCO : %10u K %s\n", vco, enable);
>+
>+ clk = vco / (p1+1) / (p2+1);
>+ enable = (96000 < clk) ? "X" : "";
>+ dev_info(&client->dev, "PIXCLK : %10u K %s\n", clk, enable);
>+
>+ clk = vco / (p3+1);
>+ enable = (768000 < clk) ? "X" : "";
>+ dev_info(&client->dev, "MIPICLK : %10u K %s\n", clk, enable);
>+
>+ clk = vco / (p6+1);
>+ enable = (96000 < clk) ? "X" : "";
>+ dev_info(&client->dev, "MCU CLK : %10u K %s\n", clk, enable);
>+
>+ clk = vco / (p5+1);
>+ enable = (54000 < clk) ? "X" : "";
>+ dev_info(&client->dev, "SOC CLK : %10u K %s\n", clk, enable);
>+
>+ clk = vco / (p4+1);
>+ enable = (70000 < clk) ? "X" : "";
>+ dev_info(&client->dev, "Sensor CLK : %10u K %s\n", clk, enable);
>+
>+ clk = vco / (p7+1);
>+ dev_info(&client->dev, "External sensor : %10u K\n", clk);
>+
>+ clk = ext / (n+1);
>+ enable = ((2000 > clk) || (24000 < clk)) ? "X" : "";
>+ dev_info(&client->dev, "PFD : %10u K %s\n", clk, enable);
>+}
>+#endif
>+
>+static void mt9t112_freame_check(u32 *width, u32 *height)
>+{
>+ if (*width > MAX_WIDTH)
>+ *width = MAX_WIDTH;
>+
>+ if (*height > MAX_HEIGHT)
>+ *height = MAX_HEIGHT;
>+}
>+
>+static int mt9t112_set_a_frame_size(const struct i2c_client *client,
>+ u16 width,
>+ u16 height)
>+{
>+ int ret;
>+ u16 wstart = (MAX_WIDTH - width) / 2;
>+ u16 hstart = (MAX_HEIGHT - height) / 2;
>+
>+ /* (Contxt A) Image Width/Height */
>+ mt9t112_mcu_write(VAR(26, 0), width);
>+ mt9t112_mcu_write(VAR(26, 2), height);
>+
>+ /* (Contxt A) Output Width/Height */
>+ mt9t112_mcu_write(VAR(18, 43), 8 + width);
>+ mt9t112_mcu_write(VAR(18, 45), 8 + height);
>+
>+ /* (Contxt A) Start Row/Column */
>+ mt9t112_mcu_write(VAR(18, 2), 4 + hstart);
>+ mt9t112_mcu_write(VAR(18, 4), 4 + wstart);
>+
>+ /* (Contxt A) End Row/Column */
>+ mt9t112_mcu_write(VAR(18, 6), 11 + height + hstart);
>+ mt9t112_mcu_write(VAR(18, 8), 11 + width + wstart);
>+
>+ mt9t112_mcu_write(VAR8(1, 0), 0x06);
>+
>+ return ret;
>+}
>+
>+static int mt9t112_set_pll_dividers(const struct i2c_client *client,
>+ u8 m, u8 n,
>+ u8 p1, u8 p2, u8 p3,
>+ u8 p4, u8 p5, u8 p6,
>+ u8 p7)
>+{
>+ int ret;
>+ u16 val;
>+
>+ /* N/M */
>+ val = (n << 8) |
>+ (m << 0);
>+ mt9t112_reg_mask_set(0x0010, 0x3fff, val);
>+
>+ /* P1/P2/P3 */
>+ val = ((p3 & 0x0F) << 8) |
>+ ((p2 & 0x0F) << 4) |
>+ ((p1 & 0x0F) << 0);
>+ mt9t112_reg_mask_set(0x0012, 0x0fff, val);
>+
>+ /* P4/P5/P6 */
>+ val = (0x7 << 12) |
>+ ((p6 & 0x0F) << 8) |
>+ ((p5 & 0x0F) << 4) |
>+ ((p4 & 0x0F) << 0);
>+ mt9t112_reg_mask_set(0x002A, 0x7fff, val);
>+
>+ /* P7 */
>+ val = (0x1 << 12) |
>+ ((p7 & 0x0F) << 0);
>+ mt9t112_reg_mask_set(0x002C, 0x100f, val);
>+
>+ return ret;
>+}
>+
>+static int mt9t112_init_pll(const struct i2c_client *client)
>+{
>+ struct mt9t112_priv *priv = to_mt9t112(client);
>+ int data, i, ret;
>+
>+ mt9t112_reg_mask_set(0x0014, 0x003, 0x0001);
>+
>+ /* PLL control: BYPASS PLL = 8517 */
>+ mt9t112_reg_write(0x0014, 0x2145);
>+
>+ /* Replace these registers when new timing parameters are generated
>*/
>+ mt9t112_set_pll_dividers(client,
>+ priv->info->divider.m,
>+ priv->info->divider.n,
>+ priv->info->divider.p1,
>+ priv->info->divider.p2,
>+ priv->info->divider.p3,
>+ priv->info->divider.p4,
>+ priv->info->divider.p5,
>+ priv->info->divider.p6,
>+ priv->info->divider.p7);
>+
>+ /*
>+ * TEST_BYPASS on
>+ * PLL_ENABLE on
>+ * SEL_LOCK_DET on
>+ * TEST_BYPASS off
>+ */
>+ mt9t112_reg_write(0x0014, 0x2525);
>+ mt9t112_reg_write(0x0014, 0x2527);
>+ mt9t112_reg_write(0x0014, 0x3427);
>+ mt9t112_reg_write(0x0014, 0x3027);
>+
>+ mdelay(10);
>+
>+ /*
>+ * PLL_BYPASS off
>+ * Reference clock count
>+ * I2C Master Clock Divider
>+ */
>+ mt9t112_reg_write(0x0014, 0x3046);
>+ mt9t112_reg_write(0x0022, 0x0190);
>+ mt9t112_reg_write(0x3B84, 0x0212);
>+
>+ /* External sensor clock is PLL bypass */
>+ mt9t112_reg_write(0x002E, 0x0500);
>+
>+ mt9t112_reg_mask_set(0x0018, 0x0002, 0x0002);
>+ mt9t112_reg_mask_set(0x3B82, 0x0004, 0x0004);
>+
>+ /* MCU disabled */
>+ mt9t112_reg_mask_set(0x0018, 0x0004, 0x0004);
>+
>+ /* out of standby */
>+ mt9t112_reg_mask_set(0x0018, 0x0001, 0);
>+
>+ mdelay(50);
>+
>+ /*
>+ * Standby Workaround
>+ * Disable Secondary I2C Pads
>+ */
>+ mt9t112_reg_write(0x0614, 0x0001);
>+ mdelay(1);
>+ mt9t112_reg_write(0x0614, 0x0001);
>+ mdelay(1);
>+ mt9t112_reg_write(0x0614, 0x0001);
>+ mdelay(1);
>+ mt9t112_reg_write(0x0614, 0x0001);
>+ mdelay(1);
>+ mt9t112_reg_write(0x0614, 0x0001);
>+ mdelay(1);
>+ mt9t112_reg_write(0x0614, 0x0001);
>+ mdelay(1);
>+
>+ /* poll to verify out of standby. Must Poll this bit */
>+ for (i = 0; i < 100; i++) {
>+ data = mt9t112_reg_read(0x0018);
>+ if (0x4000 & data)
>+ break;
>+
>+ mdelay(10);
>+ }
>+
>+ return ret;
>+}
>+
>+static int mt9t112_init_setting(const struct i2c_client *client)
>+{
>+
>+ int ret;
>+
>+ /* Adaptive Output Clock (A) */
>+ mt9t112_mcu_mask_set(VAR(26, 160), 0x0040, 0x0000);
>+
>+ /* Read Mode (A) */
>+ mt9t112_mcu_write(VAR(18, 12), 0x0024);
>+
>+ /* Fine Correction (A) */
>+ mt9t112_mcu_write(VAR(18, 15), 0x00CC);
>+
>+ /* Fine IT Min (A) */
>+ mt9t112_mcu_write(VAR(18, 17), 0x01f1);
>+
>+ /* Fine IT Max Margin (A) */
>+ mt9t112_mcu_write(VAR(18, 19), 0x00fF);
>+
>+ /* Base Frame Lines (A) */
>+ mt9t112_mcu_write(VAR(18, 29), 0x032D);
>+
>+ /* Min Line Length (A) */
>+ mt9t112_mcu_write(VAR(18, 31), 0x073a);
>+
>+ /* Line Length (A) */
>+ mt9t112_mcu_write(VAR(18, 37), 0x07d0);
>+
>+ /* Adaptive Output Clock (B) */
>+ mt9t112_mcu_mask_set(VAR(27, 160), 0x0040, 0x0000);
>+
>+ /* Row Start (B) */
>+ mt9t112_mcu_write(VAR(18, 74), 0x004);
>+
>+ /* Column Start (B) */
>+ mt9t112_mcu_write(VAR(18, 76), 0x004);
>+
>+ /* Row End (B) */
>+ mt9t112_mcu_write(VAR(18, 78), 0x60B);
>+
>+ /* Column End (B) */
>+ mt9t112_mcu_write(VAR(18, 80), 0x80B);
>+
>+ /* Fine Correction (B) */
>+ mt9t112_mcu_write(VAR(18, 87), 0x008C);
>+
>+ /* Fine IT Min (B) */
>+ mt9t112_mcu_write(VAR(18, 89), 0x01F1);
>+
>+ /* Fine IT Max Margin (B) */
>+ mt9t112_mcu_write(VAR(18, 91), 0x00FF);
>+
>+ /* Base Frame Lines (B) */
>+ mt9t112_mcu_write(VAR(18, 101), 0x0668);
>+
>+ /* Min Line Length (B) */
>+ mt9t112_mcu_write(VAR(18, 103), 0x0AF0);
>+
>+ /* Line Length (B) */
>+ mt9t112_mcu_write(VAR(18, 109), 0x0AF0);
>+
>+ /*
>+ * Flicker Dectection registers
>+ * This section should be replace whenever new Timing file is
>generated
>+ * All the following registers need to be replaced
>+ * Following registers are generated from Register Wizard but user
>can
>+ * modify them for detail auto flicker detection tuning
>+ */
>+
>+ /* FD_FDPERIOD_SELECT */
>+ mt9t112_mcu_write(VAR8(8, 5), 0x01);
>+
>+ /* PRI_B_CONFIG_FD_ALGO_RUN */
>+ mt9t112_mcu_write(VAR(27, 17), 0x0003);
>+
>+ /* PRI_A_CONFIG_FD_ALGO_RUN */
>+ mt9t112_mcu_write(VAR(26, 17), 0x0003);
>+
>+ /*
>+ * AFD range detection tuning registers
>+ */
>+
>+ /* search_f1_50 */
>+ mt9t112_mcu_write(VAR8(18, 165), 0x25);
>+
>+ /* search_f2_50 */
>+ mt9t112_mcu_write(VAR8(18, 166), 0x28);
>+
>+ /* search_f1_60 */
>+ mt9t112_mcu_write(VAR8(18, 167), 0x2C);
>+
>+ /* search_f2_60 */
>+ mt9t112_mcu_write(VAR8(18, 168), 0x2F);
>+
>+ /* period_50Hz (A) */
>+ mt9t112_mcu_write(VAR8(18, 68), 0xBA);
>+
>+ /* secret register by aptina */
>+ /* period_50Hz (A MSB) */
>+ mt9t112_mcu_write(VAR8(18, 303), 0x00);
>+
>+ /* period_60Hz (A) */
>+ mt9t112_mcu_write(VAR8(18, 69), 0x9B);
>+
>+ /* secret register by aptina */
>+ /* period_60Hz (A MSB) */
>+ mt9t112_mcu_write(VAR8(18, 301), 0x00);
>+
>+ /* period_50Hz (B) */
>+ mt9t112_mcu_write(VAR8(18, 140), 0x82);
>+
>+ /* secret register by aptina */
>+ /* period_50Hz (B) MSB */
>+ mt9t112_mcu_write(VAR8(18, 304), 0x00);
>+
>+ /* period_60Hz (B) */
>+ mt9t112_mcu_write(VAR8(18, 141), 0x6D);
>+
>+ /* secret register by aptina */
>+ /* period_60Hz (B) MSB */
>+ mt9t112_mcu_write(VAR8(18, 302), 0x00);
>+
>+ /* FD Mode */
>+ mt9t112_mcu_write(VAR8(8, 2), 0x10);
>+
>+ /* Stat_min */
>+ mt9t112_mcu_write(VAR8(8, 9), 0x02);
>+
>+ /* Stat_max */
>+ mt9t112_mcu_write(VAR8(8, 10), 0x03);
>+
>+ /* Min_amplitude */
>+ mt9t112_mcu_write(VAR8(8, 12), 0x0A);
>+
>+ /* RX FIFO Watermark (A) */
>+ mt9t112_mcu_write(VAR(18, 70), 0x0014);
>+
>+ /* RX FIFO Watermark (B) */
>+ mt9t112_mcu_write(VAR(18, 142), 0x0014);
>+
>+ /* MCLK: 16MHz
>+ * PCLK: 73MHz
>+ * CorePixCLK: 36.5 MHz
>+ */
>+ mt9t112_mcu_write(VAR8(18, 0x0044), 133);
>+ mt9t112_mcu_write(VAR8(18, 0x0045), 110);
>+ mt9t112_mcu_write(VAR8(18, 0x008c), 130);
>+ mt9t112_mcu_write(VAR8(18, 0x008d), 108);
>+
>+ mt9t112_mcu_write(VAR8(18, 0x00A5), 27);
>+ mt9t112_mcu_write(VAR8(18, 0x00a6), 30);
>+ mt9t112_mcu_write(VAR8(18, 0x00a7), 32);
>+ mt9t112_mcu_write(VAR8(18, 0x00a8), 35);
>+
>+ return ret;
>+}
>+
>+static int mt9t112_auto_focus_setting(const struct i2c_client *client)
>+{
>+ int ret;
>+
>+ mt9t112_mcu_write(VAR(12, 13), 0x000F);
>+ mt9t112_mcu_write(VAR(12, 23), 0x0F0F);
>+ mt9t112_mcu_write(VAR8(1, 0), 0x06);
>+
>+ mt9t112_reg_write(0x0614, 0x0000);
>+
>+ mt9t112_mcu_write(VAR8(1, 0), 0x05);
>+ mt9t112_mcu_write(VAR8(12, 2), 0x02);
>+ mt9t112_mcu_write(VAR(12, 3), 0x0002);
>+ mt9t112_mcu_write(VAR(17, 3), 0x8001);
>+ mt9t112_mcu_write(VAR(17, 11), 0x0025);
>+ mt9t112_mcu_write(VAR(17, 13), 0x0193);
>+ mt9t112_mcu_write(VAR8(17, 33), 0x18);
>+ mt9t112_mcu_write(VAR8(1, 0), 0x05);
>+
>+ return ret;
>+}
>+
>+static int mt9t112_auto_focus_trigger(const struct i2c_client *client)
>+{
>+ int ret;
>+
>+ mt9t112_mcu_write(VAR8(12, 25), 0x01);
>+
>+ return ret;
>+}
>+
>+static int mt9t112_init_camera(const struct i2c_client *client)
>+{
>+ int ret;
>+
>+ ECHECKER(mt9t112_reset(client));
>+
>+ ECHECKER(mt9t112_init_pll(client));
>+
>+ ECHECKER(mt9t112_init_setting(client));
>+
>+ ECHECKER(mt9t112_auto_focus_setting(client));
>+
>+ mt9t112_reg_mask_set(0x0018, 0x0004, 0);
>+
>+ /* Analog setting B */
>+ mt9t112_reg_write(0x3084, 0x2409);
>+ mt9t112_reg_write(0x3092, 0x0A49);
>+ mt9t112_reg_write(0x3094, 0x4949);
>+ mt9t112_reg_write(0x3096, 0x4950);
>+
>+ /*
>+ * Disable adaptive clock
>+ * PRI_A_CONFIG_JPEG_OB_TX_CONTROL_VAR
>+ * PRI_B_CONFIG_JPEG_OB_TX_CONTROL_VAR
>+ */
>+ mt9t112_mcu_write(VAR(26, 160), 0x0A2E);
>+ mt9t112_mcu_write(VAR(27, 160), 0x0A2E);
>+
>+ /* Configure STatus in Status_before_length Format and enable header
>*/
>+ /* PRI_B_CONFIG_JPEG_OB_TX_CONTROL_VAR */
>+ mt9t112_mcu_write(VAR(27, 144), 0x0CB4);
>+
>+ /* Enable JPEG in context B */
>+ /* PRI_B_CONFIG_JPEG_OB_TX_CONTROL_VAR */
>+ mt9t112_mcu_write(VAR8(27, 142), 0x01);
>+
>+ /* Disable Dac_TXLO */
>+ mt9t112_reg_write(0x316C, 0x350F);
>+
>+ /* Set max slew rates */
>+ mt9t112_reg_write(0x1E, 0x777);
>+
>+ return ret;
>+}
>+
>+/************************************************************************
>+
>+
>+ soc_camera_ops
>+
>+
>+************************************************************************/
>+static int mt9t112_set_bus_param(struct soc_camera_device *icd,
>+ unsigned long flags)
>+{
>+ return 0;
>+}
>+
>+static unsigned long mt9t112_query_bus_param(struct soc_camera_device
>*icd)
>+{
>+ struct i2c_client *client =
>to_i2c_client(to_soc_camera_control(icd));
>+ struct mt9t112_priv *priv = to_mt9t112(client);
>+ struct soc_camera_link *icl = to_soc_camera_link(icd);
>+ unsigned long flags = SOCAM_MASTER | SOCAM_VSYNC_ACTIVE_HIGH |
>+ SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH;
>+
>+ flags |= (priv->info->flags & MT9T112_FLAG_PCLK_RISING_EDGE) ?
>+ SOCAM_PCLK_SAMPLE_RISING : SOCAM_PCLK_SAMPLE_FALLING;
>+
>+ if (priv->info->flags & MT9T112_FLAG_DATAWIDTH_8)
>+ flags |= SOCAM_DATAWIDTH_8;
>+ else
>+ flags |= SOCAM_DATAWIDTH_10;
>+
>+ return soc_camera_apply_sensor_flags(icl, flags);
>+}
>+
>+static struct soc_camera_ops mt9t112_ops = {
>+ .set_bus_param = mt9t112_set_bus_param,
>+ .query_bus_param = mt9t112_query_bus_param,
>+};
>+
>+/************************************************************************
>+
>+
>+ v4l2_subdev_core_ops
>+
>+
>+************************************************************************/
>+static int mt9t112_g_chip_ident(struct v4l2_subdev *sd,
>+ struct v4l2_dbg_chip_ident *id)
>+{
>+ struct i2c_client *client = sd->priv;
>+ struct mt9t112_priv *priv = to_mt9t112(client);
>+
>+ id->ident = priv->model;
>+ id->revision = 0;
>+
>+ return 0;
>+}
>+
>+#ifdef CONFIG_VIDEO_ADV_DEBUG
>+static int mt9t112_g_register(struct v4l2_subdev *sd,
>+ struct v4l2_dbg_register *reg)
>+{
>+ struct i2c_client *client = sd->priv;
>+ int ret;
>+
>+ reg->size = 2;
>+ ret = mt9t112_reg_read(reg->reg);
>+ if (ret < 0)
>+ return ret;
>+
>+ reg->val = (__u64)ret;
>+
>+ return 0;
>+}
>+
>+static int mt9t112_s_register(struct v4l2_subdev *sd,
>+ struct v4l2_dbg_register *reg)
>+{
>+ struct i2c_client *client = sd->priv;
>+ int ret;
>+
>+ mt9t112_reg_write(reg->reg, reg->val);
>+
>+ return ret;
>+}
>+#endif
>+
>+static struct v4l2_subdev_core_ops mt9t112_subdev_core_ops = {
>+ .g_chip_ident = mt9t112_g_chip_ident,
>+#ifdef CONFIG_VIDEO_ADV_DEBUG
>+ .g_register = mt9t112_g_register,
>+ .s_register = mt9t112_s_register,
>+#endif
>+};
>+
>+
>+/************************************************************************
>+
>+
>+ v4l2_subdev_video_ops
>+
>+
>+************************************************************************/
>+static int mt9t112_s_stream(struct v4l2_subdev *sd, int enable)
>+{
>+ struct i2c_client *client = sd->priv;
>+ struct mt9t112_priv *priv = to_mt9t112(client);
>+ int ret = 0;
>+
>+ if (!enable) {
>+ /* FIXME
>+ *
>+ * If user selected large output size,
>+ * and used it long time,
>+ * mt9t112 camera will be very warm.
>+ *
>+ * But current driver can not stop mt9t112 camera.
>+ * So, set small size here to solve this problem.
>+ */
>+ mt9t112_set_a_frame_size(client, VGA_WIDTH, VGA_HEIGHT);
>+ return ret;
>+ }
>+
>+ if (!(priv->flags & INIT_DONE)) {
>+ u16 param = (MT9T112_FLAG_PCLK_RISING_EDGE &
>+ priv->info->flags) ? 0x0001 : 0x0000;
>+
>+ ECHECKER(mt9t112_init_camera(client));
>+
>+ /* Invert PCLK (Data sampled on falling edge of pixclk) */
>+ mt9t112_reg_write(0x3C20, param);
>+
>+ mdelay(5);
>+
>+ priv->flags |= INIT_DONE;
>+ }
>+
>+ mt9t112_mcu_write(VAR(26, 7), priv->format->fmt);
>+ mt9t112_mcu_write(VAR(26, 9), priv->format->order);
>+ mt9t112_mcu_write(VAR8(1, 0), 0x06);
>+
>+ mt9t112_set_a_frame_size(client,
>+ priv->frame.width,
>+ priv->frame.height);
>+
>+ ECHECKER(mt9t112_auto_focus_trigger(client));
>+
>+ dev_dbg(&client->dev, "format : %d\n", priv->format->code);
>+ dev_dbg(&client->dev, "size : %d x %d\n",
>+ priv->frame.width,
>+ priv->frame.height);
>+
>+ CLOCK_INFO(client, EXT_CLOCK);
>+
>+ return ret;
>+}
>+
>+static int mt9t112_set_params(struct i2c_client *client, u32 width, u32
>height,
>+ enum v4l2_imgbus_pixelcode code)
>+{
>+ struct mt9t112_priv *priv = to_mt9t112(client);
>+ int i;
>+
>+ priv->format = NULL;
>+
>+ /*
>+ * frame size check
>+ */
>+ mt9t112_freame_check(&width, &height);
>+
>+ priv->frame.width = (u16)width;
>+ priv->frame.height = (u16)height;
>+
>+ /*
>+ * get color format
>+ */
>+ for (i = 0; i < ARRAY_SIZE(mt9t112_cfmts); i++) {
>+ if (code == mt9t112_cfmts[i].code) {
>+ priv->format = mt9t112_cfmts + i;
>+ break;
>+ }
>+ }
>+ if (!priv->format)
>+ return -EINVAL;
>+
>+ return 0;
>+}
>+
>+static int mt9t112_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
>+{
>+ a->bounds.left = 0;
>+ a->bounds.top = 0;
>+ a->bounds.width = VGA_WIDTH;
>+ a->bounds.height = VGA_HEIGHT;
>+ a->defrect = a->bounds;
>+ a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>+ a->pixelaspect.numerator = 1;
>+ a->pixelaspect.denominator = 1;
>+
>+ return 0;
>+}
>+
>+static int mt9t112_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
>+{
>+ a->c.left = 0;
>+ a->c.top = 0;
>+ a->c.width = VGA_WIDTH;
>+ a->c.height = VGA_HEIGHT;
>+ a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>+
>+ return 0;
>+}
>+
>+static int mt9t112_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
>+{
>+ struct i2c_client *client = sd->priv;
>+ struct v4l2_rect *rect = &a->c;
>+
>+ return mt9t112_set_params(client, rect->width, rect->height,
>+ V4L2_IMGBUS_FMT_UYVY);
>+}
>+
>+static int mt9t112_g_fmt(struct v4l2_subdev *sd,
>+ struct v4l2_imgbus_framefmt *imgf)
>+{
>+ struct i2c_client *client = sd->priv;
>+ struct mt9t112_priv *priv = to_mt9t112(client);
>+
>+ if (!priv->format) {
>+ int ret = mt9t112_set_params(client, VGA_WIDTH, VGA_HEIGHT,
>+ V4L2_IMGBUS_FMT_UYVY);
>+ if (ret < 0)
>+ return ret;
>+ }
>+
>+ imgf->width = priv->frame.width;
>+ imgf->height = priv->frame.height;
>+ imgf->code = priv->format->code;
>+ imgf->field = V4L2_FIELD_NONE;
>+
>+ return 0;
>+}
>+
>+static int mt9t112_s_fmt(struct v4l2_subdev *sd,
>+ struct v4l2_imgbus_framefmt *imgf)
>+{
>+ struct i2c_client *client = sd->priv;
>+
>+ return mt9t112_set_params(client, imgf->width, imgf->height,
>+ imgf->code);
>+}
>+
>+static int mt9t112_try_fmt(struct v4l2_subdev *sd,
>+ struct v4l2_imgbus_framefmt *imgf)
>+{
>+ mt9t112_freame_check(&imgf->width, &imgf->height);
>+
>+ imgf->field = V4L2_FIELD_NONE;
>+
>+ return 0;
>+}
>+
>+static int mt9t112_enum_fmt(struct v4l2_subdev *sd, int index,
>+ enum v4l2_imgbus_pixelcode *code)
>+{
>+ if ((unsigned int)index >= ARRAY_SIZE(mt9t112_cfmts))
>+ return -EINVAL;
>+
>+ *code = mt9t112_cfmts[index].code;
>+ return 0;
>+}
>+
>+static struct v4l2_subdev_video_ops mt9t112_subdev_video_ops = {
>+ .s_stream = mt9t112_s_stream,
>+ .g_imgbus_fmt = mt9t112_g_fmt,
>+ .s_imgbus_fmt = mt9t112_s_fmt,
>+ .try_imgbus_fmt = mt9t112_try_fmt,
>+ .cropcap = mt9t112_cropcap,
>+ .g_crop = mt9t112_g_crop,
>+ .s_crop = mt9t112_s_crop,
>+ .enum_imgbus_fmt = mt9t112_enum_fmt,
>+};
>+
>+/************************************************************************
>+
>+
>+ i2c driver
>+
>+
>+************************************************************************/
>+static struct v4l2_subdev_ops mt9t112_subdev_ops = {
>+ .core = &mt9t112_subdev_core_ops,
>+ .video = &mt9t112_subdev_video_ops,
>+};
>+
>+static int mt9t112_camera_probe(struct soc_camera_device *icd,
>+ struct i2c_client *client)
>+{
>+ struct mt9t112_priv *priv = to_mt9t112(client);
>+ const char *devname;
>+ int chipid;
>+
>+ /*
>+ * We must have a parent by now. And it cannot be a wrong one.
>+ * So this entire test is completely redundant.
>+ */
>+ if (!icd->dev.parent ||
>+ to_soc_camera_host(icd->dev.parent)->nr != icd->iface)
>+ return -ENODEV;
>+
>+ /*
>+ * check and show chip ID
>+ */
>+ chipid = mt9t112_reg_read(0x0000);
>+ if (chipid < 0)
>+ return -EIO;
>+
>+ switch (chipid) {
>+ case 0x2680:
>+ devname = "mt9t111";
>+ priv->model = V4L2_IDENT_MT9T111;
>+ break;
>+ case 0x2682:
>+ devname = "mt9t112";
>+ priv->model = V4L2_IDENT_MT9T112;
>+ break;
>+ default:
>+ dev_err(&client->dev, "Product ID error %04x\n", chipid);
>+ return -ENODEV;
>+ }
>+
>+ dev_info(&client->dev, "%s chip ID %04x\n", devname, chipid);
>+
>+ return 0;
>+}
>+
>+static int mt9t112_probe(struct i2c_client *client,
>+ const struct i2c_device_id *did)
>+{
>+ struct mt9t112_priv *priv;
>+ struct soc_camera_device *icd = client->dev.platform_data;
>+ struct i2c_adapter *adapter;
>+ struct soc_camera_link *icl;
>+ int ret;
>+
>+ if (!icd) {
>+ dev_err(&client->dev, "mt9t112: missing soc-camera data!\n");
>+ return -EINVAL;
>+ }
>+
>+ icl = to_soc_camera_link(icd);
>+ if (!icl || !icl->priv)
>+ return -EINVAL;
>+
>+ adapter = to_i2c_adapter(client->dev.parent);
>+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
>+ dev_err(&adapter->dev,
>+ "I2C-Adapter doesn't support "
>+ "I2C_FUNC_SMBUS_BYTE_DATA\n");
>+ return -EIO;
>+ }
>+
>+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
>+ if (!priv)
>+ return -ENOMEM;
>+
>+ priv->info = icl->priv;
>+
>+ v4l2_i2c_subdev_init(&priv->subdev, client, &mt9t112_subdev_ops);
>+
>+ icd->ops = &mt9t112_ops;
>+
>+ ret = mt9t112_camera_probe(icd, client);
>+ if (ret) {
>+ icd->ops = NULL;
>+ i2c_set_clientdata(client, NULL);
>+ kfree(priv);
>+ }
>+
>+ return ret;
>+}
>+
>+static int mt9t112_remove(struct i2c_client *client)
>+{
>+ struct mt9t112_priv *priv = to_mt9t112(client);
>+ struct soc_camera_device *icd = client->dev.platform_data;
>+
>+ icd->ops = NULL;
>+ i2c_set_clientdata(client, NULL);
>+ kfree(priv);
>+ return 0;
>+}
>+
>+static const struct i2c_device_id mt9t112_id[] = {
>+ { "mt9t112", 0 },
>+ { }
>+};
>+MODULE_DEVICE_TABLE(i2c, mt9t112_id);
>+
>+static struct i2c_driver mt9t112_i2c_driver = {
>+ .driver = {
>+ .name = "mt9t112",
>+ },
>+ .probe = mt9t112_probe,
>+ .remove = mt9t112_remove,
>+ .id_table = mt9t112_id,
>+};
>+
>+/************************************************************************
>+
>+
>+ module function
>+
>+
>+************************************************************************/
>+static int __init mt9t112_module_init(void)
>+{
>+ return i2c_add_driver(&mt9t112_i2c_driver);
>+}
>+
>+static void __exit mt9t112_module_exit(void)
>+{
>+ i2c_del_driver(&mt9t112_i2c_driver);
>+}
>+
>+module_init(mt9t112_module_init);
>+module_exit(mt9t112_module_exit);
>+
>+MODULE_DESCRIPTION("SoC Camera driver for mt9t112");
>+MODULE_AUTHOR("Kuninori Morimoto");
>+MODULE_LICENSE("GPL v2");
>diff --git a/include/media/mt9t112.h b/include/media/mt9t112.h
>new file mode 100644
>index 0000000..023a39e
>--- /dev/null
>+++ b/include/media/mt9t112.h
>@@ -0,0 +1,32 @@
>+/* mt9t112 Camera
>+ *
>+ * Copyright (C) 2009 Renesas Solutions Corp.
>+ * Kuninori Morimoto <morimoto.kuninori@renesas.com>
>+ *
>+ * 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 __MT9T112_H__
>+#define __MT9T112_H__
>+
>+#include <media/soc_camera.h>
>+
>+#define MT9T112_FLAG_PCLK_RISING_EDGE (1 << 0)
>+#define MT9T112_FLAG_DATAWIDTH_8 (1 << 1) /* default width is 10 */
>+
>+struct mt9t112_pll_divider {
>+ u8 m, n;
>+ u8 p1, p2, p3, p4, p5, p6, p7;
>+};
>+
>+/*
>+ * mt9t112 camera info
>+ */
>+struct mt9t112_camera_info {
>+ u32 flags;
>+ struct mt9t112_pll_divider divider;
>+};
>+
>+#endif /* __MT9T112_H__ */
>diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-
>ident.h
>index 56a5975..82c9e8a 100644
>--- a/include/media/v4l2-chip-ident.h
>+++ b/include/media/v4l2-chip-ident.h
>@@ -248,6 +248,8 @@ enum {
> V4L2_IDENT_MT9V022IX7ATC = 45010, /* No way to detect "normal"
>I77ATx */
> V4L2_IDENT_MT9V022IX7ATM = 45015, /* and "lead free" IA7ATx
>chips */
> V4L2_IDENT_MT9T031 = 45020,
>+ V4L2_IDENT_MT9T111 = 45021,
>+ V4L2_IDENT_MT9T112 = 45022,
> V4L2_IDENT_MT9V111 = 45031,
> V4L2_IDENT_MT9V112 = 45032,
>
>--
>1.6.3.3
>
>--
>To unsubscribe from this list: send the line "unsubscribe linux-media" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 19 Nov 2009, Karicheri, Muralidharan wrote:
> Hi,
>
> Please make this a generic driver so that it can be used across
> other SoCs as well. BTW, on which SoC have you tested this driver?
> There seems to be a lot of soc-camera specific stuffs here.
> Example, probe() is getting a pointer to struct soc_camera_device *icd.
> I have been working with Guennadi to make the MT9T031.c driver work for
> TI's VPFE on DMxxx SOCs. since this is a new driver, I would like to see
> it de-coupled from soc-camera framework and implemented as a generic
> v4l2-subdevice driver.
Murali, yes, our aim is to make sensor drivers universally usable, using
the v4l2-subdev API. But ATM sensor drivers, written and tested to work
with soc-camera hosts, cannot be absolutely soc-camera free. Although, we
can (and shall) try to make them at least partially usable outside of the
soc-camera framework, as I have done with the mt9t031 driver. ATM this
driver would refuse to work with a non soc-camera host, or even
misfunction, if that host driver is using i2c client platform data for
something else. Yes, we'll fix this, but don't expect it to become
absolutely soc-camera free for now.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Guennadi,
I am not sure what you mean by ATM sensor. Is it not a
Aptina/Micron sensor giving Raw Bayer RGB or Yuv data?
Not sure what prevents it from interfacing with VPFE.
In otherwords, how is this different from mt9t031/mt9t001
in terms of hardware signals available to interface to
a SOC?
Murali Karicheri
Software Design Engineer
Texas Instruments Inc.
Germantown, MD 20874
phone: 301-407-9583
email: m-karicheri2@ti.com
>-----Original Message-----
>From: linux-media-owner@vger.kernel.org [mailto:linux-media-
>owner@vger.kernel.org] On Behalf Of Guennadi Liakhovetski
>Sent: Thursday, November 19, 2009 9:55 AM
>To: Karicheri, Muralidharan
>Cc: Kuninori Morimoto; Linux-V4L2
>Subject: RE: [PATCH] soc-camera: Add mt9t112 camera support
>
>On Thu, 19 Nov 2009, Karicheri, Muralidharan wrote:
>
>> Hi,
>>
>> Please make this a generic driver so that it can be used across
>> other SoCs as well. BTW, on which SoC have you tested this driver?
>> There seems to be a lot of soc-camera specific stuffs here.
>> Example, probe() is getting a pointer to struct soc_camera_device *icd.
>> I have been working with Guennadi to make the MT9T031.c driver work for
>> TI's VPFE on DMxxx SOCs. since this is a new driver, I would like to see
>> it de-coupled from soc-camera framework and implemented as a generic
>> v4l2-subdevice driver.
>
>Murali, yes, our aim is to make sensor drivers universally usable, using
>the v4l2-subdev API. But ATM sensor drivers, written and tested to work
>with soc-camera hosts, cannot be absolutely soc-camera free. Although, we
>can (and shall) try to make them at least partially usable outside of the
>soc-camera framework, as I have done with the mt9t031 driver. ATM this
>driver would refuse to work with a non soc-camera host, or even
>misfunction, if that host driver is using i2c client platform data for
>something else. Yes, we'll fix this, but don't expect it to become
>absolutely soc-camera free for now.
>
>Thanks
>Guennadi
>---
>Guennadi Liakhovetski, Ph.D.
>Freelance Open-Source Software Developer
>http://www.open-technology.de/
>--
>To unsubscribe from this list: send the line "unsubscribe linux-media" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 19 Nov 2009, Karicheri, Muralidharan wrote:
> Guennadi,
>
> I am not sure what you mean by ATM sensor.
ATM = "At the moment."
> Is it not a
> Aptina/Micron sensor giving Raw Bayer RGB or Yuv data?
I presume it is.
> Not sure what prevents it from interfacing with VPFE.
> In otherwords, how is this different from mt9t031/mt9t001
> in terms of hardware signals available to interface to
> a SOC?
It is not. It just has been developed for a host, using soc-camera. And so
you have to use soc-camera functionality, like query/set_bus_param, not
yet available in v4l2-subdev, to get this client driver to work with that
host driver.
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Nov 19, 2009 at 6:15 PM, Kuninori Morimoto
<morimoto.kuninori@renesas.com> wrote:
> Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
> ---
>>> Guennadi
>
> I add new number in v4l2-chip-ident.h
> Is it OK for you ?
>
> This camera is very picky.
> So, it have a lot of constant value.
>
> The register of mt9t112 and mt9t111 are same.
> But I have mt9t112 only.
> mt9t111 should also work, but I can not check.
>
> This patch is based on your 20091105 patches.
>
>  drivers/media/video/Kconfig   |   6 +
>  drivers/media/video/Makefile   |   1 +
>  drivers/media/video/mt9t112.c  | 1158 +++++++++++++++++++++++++++++++++++++++
>  include/media/mt9t112.h     |  32 ++
> Â include/media/v4l2-chip-ident.h | Â Â 2 +
> Â 5 files changed, 1199 insertions(+), 0 deletions(-)
> Â create mode 100644 drivers/media/video/mt9t112.c
> Â create mode 100644 include/media/mt9t112.h
Hi Morimoto-san,
Do you have any mt9t112 platform data for the ecovec board? I'd like
to try out this patch but I don't know which board specific parts that
are missing!
/ magnus
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Magnus
> Do you have any mt9t112 platform data for the ecovec board? I'd like
> to try out this patch but I don't know which board specific parts that
> are missing!
Yes I have.
I attached it.
This platform patch is based on Guennadi's latest patches.
I also attached tw9910 platform patch.
Please apply in order of tw9910 -> mt9t112.
Best regards
--
Kuninori Morimoto
Hey Morimoto-san,
On Thu, Nov 26, 2009 at 9:50 AM, Kuninori Morimoto
<morimoto.kuninori@renesas.com> wrote:
>> Do you have any mt9t112 platform data for the ecovec board? I'd like
>> to try out this patch but I don't know which board specific parts that
>> are missing!
>
> Yes I have.
> I attached it.
> This platform patch is based on Guennadi's latest patches.
>
> I also attached tw9910 platform patch.
> Please apply in order of tw9910 -> mt9t112.
Thanks for the patches.
So now I've done some testing of the mt9t112 sensor hooked up to CEU0
on the ecovec board. I tried 16-bit RGB and NV12 in various
resolutions with mplayer. My only comment is that it seems to take a
bit of time to setup the sensor initially, but that may be something
related to the camera sensor itself.
Cheers,
/ magnus
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Magnus
> So now I've done some testing of the mt9t112 sensor hooked up to CEU0
> on the ecovec board. I tried 16-bit RGB and NV12 in various
> resolutions with mplayer. My only comment is that it seems to take a
> bit of time to setup the sensor initially, but that may be something
> related to the camera sensor itself.
Yes, This driver needs long time for init only once.
I think you can find it on last of mt9t112_init_pll.
This driver is very picky...
Best regards
--
Kuninori Morimoto
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
@@ -840,6 +840,12 @@ config SOC_CAMERA_MT9T031
help
This driver supports MT9T031 cameras from Micron.
+config SOC_CAMERA_MT9T112
+ tristate "mt9t112 support"
+ depends on SOC_CAMERA && I2C
+ help
+ This driver supports MT9T112 cameras from Aptina.
+
config SOC_CAMERA_MT9V022
tristate "mt9v022 support"
depends on SOC_CAMERA && I2C
@@ -75,6 +75,7 @@ obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o
obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o
obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o
obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o
+obj-$(CONFIG_SOC_CAMERA_MT9T112) += mt9t112.o
obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o
obj-$(CONFIG_SOC_CAMERA_OV9640) += ov9640.o
new file mode 100644
@@ -0,0 +1,1158 @@
+/*
+ * mt9t112 Camera Driver
+ *
+ * Copyright (C) 2009 Renesas Solutions Corp.
+ * Kuninori Morimoto <morimoto.kuninori@renesas.com>
+ *
+ * Based on ov772x driver, mt9m111 driver,
+ *
+ * Copyright (C) 2008 Kuninori Morimoto <morimoto.kuninori@renesas.com>
+ * Copyright (C) 2008, Robert Jarzmik <robert.jarzmik@free.fr>
+ * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net>
+ * Copyright (C) 2008 Magnus Damm
+ * 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.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/videodev2.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-common.h>
+#include <media/soc_camera.h>
+#include <media/mt9t112.h>
+
+/* you can check PLL/clock info */
+/* #define EXT_CLOCK 24000000 */
+
+/************************************************************************
+
+
+ macro
+
+
+************************************************************************/
+/*
+ * frame size
+ */
+#define MAX_WIDTH 2048
+#define MAX_HEIGHT 1536
+
+#define VGA_WIDTH 640
+#define VGA_HEIGHT 480
+
+/*
+ * macro of read/write
+ */
+#define ECHECKER(x) \
+ do { \
+ ret = x; \
+ if (ret < 0) \
+ return ret; \
+ } while (0)
+
+#define mt9t112_reg_write(a, b) ECHECKER(__mt9t112_reg_write(client, a, b))
+#define mt9t112_mcu_write(a, b) ECHECKER(__mt9t112_mcu_write(client, a, b))
+
+#define mt9t112_reg_mask_set(a, b, c)\
+ ECHECKER(__mt9t112_reg_mask_set(client, a, b, c))
+#define mt9t112_mcu_mask_set(a, b, c)\
+ ECHECKER(__mt9t112_mcu_mask_set(client, a, b, c))
+
+#define mt9t112_reg_read(a) __mt9t112_reg_read(client, a)
+#define mt9t112_mcu_read(a) __mt9t112_mcu_read(client, a)
+
+/*
+ * Logical address
+ */
+#define _VAR(id, offset, base) (base | (id & 0x1f) << 10 | (offset & 0x3ff))
+#define VAR(id, offset) _VAR(id, offset, 0x0000)
+#define VAR8(id, offset) _VAR(id, offset, 0x8000)
+
+/************************************************************************
+
+
+ struct
+
+
+************************************************************************/
+struct mt9t112_frame_size {
+ u16 width;
+ u16 height;
+};
+
+struct mt9t112_format {
+ const enum v4l2_imgbus_pixelcode code;
+ u16 fmt;
+ u16 order;
+};
+
+struct mt9t112_priv {
+ struct v4l2_subdev subdev;
+ struct mt9t112_camera_info *info;
+ struct i2c_client *client;
+ struct soc_camera_device icd;
+ struct mt9t112_frame_size frame;
+ const struct mt9t112_format *format;
+ int model;
+ u32 flags;
+/* for flags */
+#define INIT_DONE (1<<0)
+};
+
+/************************************************************************
+
+
+ supported format
+
+
+************************************************************************/
+#define FMT(_code, _fmt, _order) { .code = V4L2_IMGBUS_FMT_ ## _code,\
+ .fmt = _fmt,\
+ .order = _order, }
+static const struct mt9t112_format mt9t112_cfmts[] = {
+ FMT(UYVY, 0x0001, 0x0000),
+ FMT(VYUY, 0x0001, 0x0001),
+ FMT(YUYV, 0x0001, 0x0002),
+ FMT(YVYU, 0x0001, 0x0003),
+ FMT(RGB555, 0x0008, 0x0002),
+ FMT(RGB565, 0x0004, 0x0002),
+};
+
+/************************************************************************
+
+
+ general function
+
+
+************************************************************************/
+static struct mt9t112_priv *to_mt9t112(const struct i2c_client *client)
+{
+ return container_of(i2c_get_clientdata(client),
+ struct mt9t112_priv,
+ subdev);
+}
+
+static int __mt9t112_reg_read(const struct i2c_client *client, u16 command)
+{
+ struct i2c_msg msg[2];
+ u8 buf[2];
+ int ret;
+
+ command = swab16(command);
+
+ msg[0].addr = client->addr;
+ msg[0].flags = 0;
+ msg[0].len = 2;
+ msg[0].buf = (u8 *)&command;
+
+ msg[1].addr = client->addr;
+ msg[1].flags = I2C_M_RD;
+ msg[1].len = 2;
+ msg[1].buf = buf;
+
+ /*
+ * if return value of this function is < 0,
+ * it mean error.
+ * else, under 16bit is valid data.
+ */
+ ret = i2c_transfer(client->adapter, msg, 2);
+ if (ret < 0)
+ return ret;
+
+ memcpy(&ret, buf, 2);
+ return swab16(ret);
+}
+
+static int __mt9t112_reg_write(const struct i2c_client *client,
+ u16 command, u16 data)
+{
+ struct i2c_msg msg;
+ u8 buf[4];
+ int ret;
+
+ command = swab16(command);
+ data = swab16(data);
+
+ memcpy(buf + 0, &command, 2);
+ memcpy(buf + 2, &data, 2);
+
+ msg.addr = client->addr;
+ msg.flags = 0;
+ msg.len = 4;
+ msg.buf = buf;
+
+ /*
+ * i2c_transfer return message length,
+ * but this function should return 0 if correct case
+ * */
+ ret = i2c_transfer(client->adapter, &msg, 1);
+ if (ret >= 0)
+ ret = 0;
+
+ return ret;
+}
+
+static int __mt9t112_reg_mask_set(const struct i2c_client *client,
+ u16 command,
+ u16 mask,
+ u16 set)
+{
+ int val = __mt9t112_reg_read(client, command);
+ if (val < 0)
+ return val;
+
+ val &= ~mask;
+ val |= set & mask;
+
+ return __mt9t112_reg_write(client, command, val);
+}
+
+/* mcu access */
+static int __mt9t112_mcu_read(const struct i2c_client *client, u16 command)
+{
+ int ret;
+
+ ret = __mt9t112_reg_write(client, 0x098E, command);
+ if (ret < 0)
+ return ret;
+
+ return __mt9t112_reg_read(client, 0x0990);
+}
+
+static int __mt9t112_mcu_write(const struct i2c_client *client,
+ u16 command, u16 data)
+{
+ int ret;
+
+ ret = __mt9t112_reg_write(client, 0x098E, command);
+ if (ret < 0)
+ return ret;
+
+ return __mt9t112_reg_write(client, 0x0990, data);
+}
+
+static int __mt9t112_mcu_mask_set(const struct i2c_client *client,
+ u16 command,
+ u16 mask,
+ u16 set)
+{
+ int val = __mt9t112_mcu_read(client, command);
+ if (val < 0)
+ return val;
+
+ val &= ~mask;
+ val |= set & mask;
+
+ return __mt9t112_mcu_write(client, command, val);
+}
+
+static int mt9t112_reset(const struct i2c_client *client)
+{
+ int ret;
+
+ mt9t112_reg_mask_set(0x001a, 0x0001, 0x0001);
+ msleep(1);
+ mt9t112_reg_mask_set(0x001a, 0x0001, 0x0000);
+
+ return ret;
+}
+
+#ifndef EXT_CLOCK
+#define CLOCK_INFO(a, b)
+#else
+#define CLOCK_INFO(a, b) mt9t112_clock_info(a, b)
+static void mt9t112_clock_info(const struct i2c_client *client, u32 ext)
+{
+ int m, n, p1, p2, p3, p4, p5, p6, p7;
+ u32 vco, clk;
+ char *enable;
+
+ ext /= 1000; /* kbyte order */
+
+ n = mt9t112_reg_read(0x0012);
+ p1 = n & 0x000f;
+ n = n >> 4;
+ p2 = n & 0x000f;
+ n = n >> 4;
+ p3 = n & 0x000f;
+
+ n = mt9t112_reg_read(0x002a);
+ p4 = n & 0x000f;
+ n = n >> 4;
+ p5 = n & 0x000f;
+ n = n >> 4;
+ p6 = n & 0x000f;
+
+ n = mt9t112_reg_read(0x002c);
+ p7 = n & 0x000f;
+
+ n = mt9t112_reg_read(0x0010);
+ m = n & 0x00ff;
+ n = (n >> 8) & 0x003f;
+
+ enable = ((6000 > ext) || (54000 < ext)) ? "X" : "";
+ dev_info(&client->dev, "EXTCLK : %10u K %s\n", ext, enable);
+
+ vco = 2 * m * ext / (n+1);
+ enable = ((384000 > vco) || (768000 < vco)) ? "X" : "";
+ dev_info(&client->dev, "VCO : %10u K %s\n", vco, enable);
+
+ clk = vco / (p1+1) / (p2+1);
+ enable = (96000 < clk) ? "X" : "";
+ dev_info(&client->dev, "PIXCLK : %10u K %s\n", clk, enable);
+
+ clk = vco / (p3+1);
+ enable = (768000 < clk) ? "X" : "";
+ dev_info(&client->dev, "MIPICLK : %10u K %s\n", clk, enable);
+
+ clk = vco / (p6+1);
+ enable = (96000 < clk) ? "X" : "";
+ dev_info(&client->dev, "MCU CLK : %10u K %s\n", clk, enable);
+
+ clk = vco / (p5+1);
+ enable = (54000 < clk) ? "X" : "";
+ dev_info(&client->dev, "SOC CLK : %10u K %s\n", clk, enable);
+
+ clk = vco / (p4+1);
+ enable = (70000 < clk) ? "X" : "";
+ dev_info(&client->dev, "Sensor CLK : %10u K %s\n", clk, enable);
+
+ clk = vco / (p7+1);
+ dev_info(&client->dev, "External sensor : %10u K\n", clk);
+
+ clk = ext / (n+1);
+ enable = ((2000 > clk) || (24000 < clk)) ? "X" : "";
+ dev_info(&client->dev, "PFD : %10u K %s\n", clk, enable);
+}
+#endif
+
+static void mt9t112_freame_check(u32 *width, u32 *height)
+{
+ if (*width > MAX_WIDTH)
+ *width = MAX_WIDTH;
+
+ if (*height > MAX_HEIGHT)
+ *height = MAX_HEIGHT;
+}
+
+static int mt9t112_set_a_frame_size(const struct i2c_client *client,
+ u16 width,
+ u16 height)
+{
+ int ret;
+ u16 wstart = (MAX_WIDTH - width) / 2;
+ u16 hstart = (MAX_HEIGHT - height) / 2;
+
+ /* (Contxt A) Image Width/Height */
+ mt9t112_mcu_write(VAR(26, 0), width);
+ mt9t112_mcu_write(VAR(26, 2), height);
+
+ /* (Contxt A) Output Width/Height */
+ mt9t112_mcu_write(VAR(18, 43), 8 + width);
+ mt9t112_mcu_write(VAR(18, 45), 8 + height);
+
+ /* (Contxt A) Start Row/Column */
+ mt9t112_mcu_write(VAR(18, 2), 4 + hstart);
+ mt9t112_mcu_write(VAR(18, 4), 4 + wstart);
+
+ /* (Contxt A) End Row/Column */
+ mt9t112_mcu_write(VAR(18, 6), 11 + height + hstart);
+ mt9t112_mcu_write(VAR(18, 8), 11 + width + wstart);
+
+ mt9t112_mcu_write(VAR8(1, 0), 0x06);
+
+ return ret;
+}
+
+static int mt9t112_set_pll_dividers(const struct i2c_client *client,
+ u8 m, u8 n,
+ u8 p1, u8 p2, u8 p3,
+ u8 p4, u8 p5, u8 p6,
+ u8 p7)
+{
+ int ret;
+ u16 val;
+
+ /* N/M */
+ val = (n << 8) |
+ (m << 0);
+ mt9t112_reg_mask_set(0x0010, 0x3fff, val);
+
+ /* P1/P2/P3 */
+ val = ((p3 & 0x0F) << 8) |
+ ((p2 & 0x0F) << 4) |
+ ((p1 & 0x0F) << 0);
+ mt9t112_reg_mask_set(0x0012, 0x0fff, val);
+
+ /* P4/P5/P6 */
+ val = (0x7 << 12) |
+ ((p6 & 0x0F) << 8) |
+ ((p5 & 0x0F) << 4) |
+ ((p4 & 0x0F) << 0);
+ mt9t112_reg_mask_set(0x002A, 0x7fff, val);
+
+ /* P7 */
+ val = (0x1 << 12) |
+ ((p7 & 0x0F) << 0);
+ mt9t112_reg_mask_set(0x002C, 0x100f, val);
+
+ return ret;
+}
+
+static int mt9t112_init_pll(const struct i2c_client *client)
+{
+ struct mt9t112_priv *priv = to_mt9t112(client);
+ int data, i, ret;
+
+ mt9t112_reg_mask_set(0x0014, 0x003, 0x0001);
+
+ /* PLL control: BYPASS PLL = 8517 */
+ mt9t112_reg_write(0x0014, 0x2145);
+
+ /* Replace these registers when new timing parameters are generated */
+ mt9t112_set_pll_dividers(client,
+ priv->info->divider.m,
+ priv->info->divider.n,
+ priv->info->divider.p1,
+ priv->info->divider.p2,
+ priv->info->divider.p3,
+ priv->info->divider.p4,
+ priv->info->divider.p5,
+ priv->info->divider.p6,
+ priv->info->divider.p7);
+
+ /*
+ * TEST_BYPASS on
+ * PLL_ENABLE on
+ * SEL_LOCK_DET on
+ * TEST_BYPASS off
+ */
+ mt9t112_reg_write(0x0014, 0x2525);
+ mt9t112_reg_write(0x0014, 0x2527);
+ mt9t112_reg_write(0x0014, 0x3427);
+ mt9t112_reg_write(0x0014, 0x3027);
+
+ mdelay(10);
+
+ /*
+ * PLL_BYPASS off
+ * Reference clock count
+ * I2C Master Clock Divider
+ */
+ mt9t112_reg_write(0x0014, 0x3046);
+ mt9t112_reg_write(0x0022, 0x0190);
+ mt9t112_reg_write(0x3B84, 0x0212);
+
+ /* External sensor clock is PLL bypass */
+ mt9t112_reg_write(0x002E, 0x0500);
+
+ mt9t112_reg_mask_set(0x0018, 0x0002, 0x0002);
+ mt9t112_reg_mask_set(0x3B82, 0x0004, 0x0004);
+
+ /* MCU disabled */
+ mt9t112_reg_mask_set(0x0018, 0x0004, 0x0004);
+
+ /* out of standby */
+ mt9t112_reg_mask_set(0x0018, 0x0001, 0);
+
+ mdelay(50);
+
+ /*
+ * Standby Workaround
+ * Disable Secondary I2C Pads
+ */
+ mt9t112_reg_write(0x0614, 0x0001);
+ mdelay(1);
+ mt9t112_reg_write(0x0614, 0x0001);
+ mdelay(1);
+ mt9t112_reg_write(0x0614, 0x0001);
+ mdelay(1);
+ mt9t112_reg_write(0x0614, 0x0001);
+ mdelay(1);
+ mt9t112_reg_write(0x0614, 0x0001);
+ mdelay(1);
+ mt9t112_reg_write(0x0614, 0x0001);
+ mdelay(1);
+
+ /* poll to verify out of standby. Must Poll this bit */
+ for (i = 0; i < 100; i++) {
+ data = mt9t112_reg_read(0x0018);
+ if (0x4000 & data)
+ break;
+
+ mdelay(10);
+ }
+
+ return ret;
+}
+
+static int mt9t112_init_setting(const struct i2c_client *client)
+{
+
+ int ret;
+
+ /* Adaptive Output Clock (A) */
+ mt9t112_mcu_mask_set(VAR(26, 160), 0x0040, 0x0000);
+
+ /* Read Mode (A) */
+ mt9t112_mcu_write(VAR(18, 12), 0x0024);
+
+ /* Fine Correction (A) */
+ mt9t112_mcu_write(VAR(18, 15), 0x00CC);
+
+ /* Fine IT Min (A) */
+ mt9t112_mcu_write(VAR(18, 17), 0x01f1);
+
+ /* Fine IT Max Margin (A) */
+ mt9t112_mcu_write(VAR(18, 19), 0x00fF);
+
+ /* Base Frame Lines (A) */
+ mt9t112_mcu_write(VAR(18, 29), 0x032D);
+
+ /* Min Line Length (A) */
+ mt9t112_mcu_write(VAR(18, 31), 0x073a);
+
+ /* Line Length (A) */
+ mt9t112_mcu_write(VAR(18, 37), 0x07d0);
+
+ /* Adaptive Output Clock (B) */
+ mt9t112_mcu_mask_set(VAR(27, 160), 0x0040, 0x0000);
+
+ /* Row Start (B) */
+ mt9t112_mcu_write(VAR(18, 74), 0x004);
+
+ /* Column Start (B) */
+ mt9t112_mcu_write(VAR(18, 76), 0x004);
+
+ /* Row End (B) */
+ mt9t112_mcu_write(VAR(18, 78), 0x60B);
+
+ /* Column End (B) */
+ mt9t112_mcu_write(VAR(18, 80), 0x80B);
+
+ /* Fine Correction (B) */
+ mt9t112_mcu_write(VAR(18, 87), 0x008C);
+
+ /* Fine IT Min (B) */
+ mt9t112_mcu_write(VAR(18, 89), 0x01F1);
+
+ /* Fine IT Max Margin (B) */
+ mt9t112_mcu_write(VAR(18, 91), 0x00FF);
+
+ /* Base Frame Lines (B) */
+ mt9t112_mcu_write(VAR(18, 101), 0x0668);
+
+ /* Min Line Length (B) */
+ mt9t112_mcu_write(VAR(18, 103), 0x0AF0);
+
+ /* Line Length (B) */
+ mt9t112_mcu_write(VAR(18, 109), 0x0AF0);
+
+ /*
+ * Flicker Dectection registers
+ * This section should be replace whenever new Timing file is generated
+ * All the following registers need to be replaced
+ * Following registers are generated from Register Wizard but user can
+ * modify them for detail auto flicker detection tuning
+ */
+
+ /* FD_FDPERIOD_SELECT */
+ mt9t112_mcu_write(VAR8(8, 5), 0x01);
+
+ /* PRI_B_CONFIG_FD_ALGO_RUN */
+ mt9t112_mcu_write(VAR(27, 17), 0x0003);
+
+ /* PRI_A_CONFIG_FD_ALGO_RUN */
+ mt9t112_mcu_write(VAR(26, 17), 0x0003);
+
+ /*
+ * AFD range detection tuning registers
+ */
+
+ /* search_f1_50 */
+ mt9t112_mcu_write(VAR8(18, 165), 0x25);
+
+ /* search_f2_50 */
+ mt9t112_mcu_write(VAR8(18, 166), 0x28);
+
+ /* search_f1_60 */
+ mt9t112_mcu_write(VAR8(18, 167), 0x2C);
+
+ /* search_f2_60 */
+ mt9t112_mcu_write(VAR8(18, 168), 0x2F);
+
+ /* period_50Hz (A) */
+ mt9t112_mcu_write(VAR8(18, 68), 0xBA);
+
+ /* secret register by aptina */
+ /* period_50Hz (A MSB) */
+ mt9t112_mcu_write(VAR8(18, 303), 0x00);
+
+ /* period_60Hz (A) */
+ mt9t112_mcu_write(VAR8(18, 69), 0x9B);
+
+ /* secret register by aptina */
+ /* period_60Hz (A MSB) */
+ mt9t112_mcu_write(VAR8(18, 301), 0x00);
+
+ /* period_50Hz (B) */
+ mt9t112_mcu_write(VAR8(18, 140), 0x82);
+
+ /* secret register by aptina */
+ /* period_50Hz (B) MSB */
+ mt9t112_mcu_write(VAR8(18, 304), 0x00);
+
+ /* period_60Hz (B) */
+ mt9t112_mcu_write(VAR8(18, 141), 0x6D);
+
+ /* secret register by aptina */
+ /* period_60Hz (B) MSB */
+ mt9t112_mcu_write(VAR8(18, 302), 0x00);
+
+ /* FD Mode */
+ mt9t112_mcu_write(VAR8(8, 2), 0x10);
+
+ /* Stat_min */
+ mt9t112_mcu_write(VAR8(8, 9), 0x02);
+
+ /* Stat_max */
+ mt9t112_mcu_write(VAR8(8, 10), 0x03);
+
+ /* Min_amplitude */
+ mt9t112_mcu_write(VAR8(8, 12), 0x0A);
+
+ /* RX FIFO Watermark (A) */
+ mt9t112_mcu_write(VAR(18, 70), 0x0014);
+
+ /* RX FIFO Watermark (B) */
+ mt9t112_mcu_write(VAR(18, 142), 0x0014);
+
+ /* MCLK: 16MHz
+ * PCLK: 73MHz
+ * CorePixCLK: 36.5 MHz
+ */
+ mt9t112_mcu_write(VAR8(18, 0x0044), 133);
+ mt9t112_mcu_write(VAR8(18, 0x0045), 110);
+ mt9t112_mcu_write(VAR8(18, 0x008c), 130);
+ mt9t112_mcu_write(VAR8(18, 0x008d), 108);
+
+ mt9t112_mcu_write(VAR8(18, 0x00A5), 27);
+ mt9t112_mcu_write(VAR8(18, 0x00a6), 30);
+ mt9t112_mcu_write(VAR8(18, 0x00a7), 32);
+ mt9t112_mcu_write(VAR8(18, 0x00a8), 35);
+
+ return ret;
+}
+
+static int mt9t112_auto_focus_setting(const struct i2c_client *client)
+{
+ int ret;
+
+ mt9t112_mcu_write(VAR(12, 13), 0x000F);
+ mt9t112_mcu_write(VAR(12, 23), 0x0F0F);
+ mt9t112_mcu_write(VAR8(1, 0), 0x06);
+
+ mt9t112_reg_write(0x0614, 0x0000);
+
+ mt9t112_mcu_write(VAR8(1, 0), 0x05);
+ mt9t112_mcu_write(VAR8(12, 2), 0x02);
+ mt9t112_mcu_write(VAR(12, 3), 0x0002);
+ mt9t112_mcu_write(VAR(17, 3), 0x8001);
+ mt9t112_mcu_write(VAR(17, 11), 0x0025);
+ mt9t112_mcu_write(VAR(17, 13), 0x0193);
+ mt9t112_mcu_write(VAR8(17, 33), 0x18);
+ mt9t112_mcu_write(VAR8(1, 0), 0x05);
+
+ return ret;
+}
+
+static int mt9t112_auto_focus_trigger(const struct i2c_client *client)
+{
+ int ret;
+
+ mt9t112_mcu_write(VAR8(12, 25), 0x01);
+
+ return ret;
+}
+
+static int mt9t112_init_camera(const struct i2c_client *client)
+{
+ int ret;
+
+ ECHECKER(mt9t112_reset(client));
+
+ ECHECKER(mt9t112_init_pll(client));
+
+ ECHECKER(mt9t112_init_setting(client));
+
+ ECHECKER(mt9t112_auto_focus_setting(client));
+
+ mt9t112_reg_mask_set(0x0018, 0x0004, 0);
+
+ /* Analog setting B */
+ mt9t112_reg_write(0x3084, 0x2409);
+ mt9t112_reg_write(0x3092, 0x0A49);
+ mt9t112_reg_write(0x3094, 0x4949);
+ mt9t112_reg_write(0x3096, 0x4950);
+
+ /*
+ * Disable adaptive clock
+ * PRI_A_CONFIG_JPEG_OB_TX_CONTROL_VAR
+ * PRI_B_CONFIG_JPEG_OB_TX_CONTROL_VAR
+ */
+ mt9t112_mcu_write(VAR(26, 160), 0x0A2E);
+ mt9t112_mcu_write(VAR(27, 160), 0x0A2E);
+
+ /* Configure STatus in Status_before_length Format and enable header */
+ /* PRI_B_CONFIG_JPEG_OB_TX_CONTROL_VAR */
+ mt9t112_mcu_write(VAR(27, 144), 0x0CB4);
+
+ /* Enable JPEG in context B */
+ /* PRI_B_CONFIG_JPEG_OB_TX_CONTROL_VAR */
+ mt9t112_mcu_write(VAR8(27, 142), 0x01);
+
+ /* Disable Dac_TXLO */
+ mt9t112_reg_write(0x316C, 0x350F);
+
+ /* Set max slew rates */
+ mt9t112_reg_write(0x1E, 0x777);
+
+ return ret;
+}
+
+/************************************************************************
+
+
+ soc_camera_ops
+
+
+************************************************************************/
+static int mt9t112_set_bus_param(struct soc_camera_device *icd,
+ unsigned long flags)
+{
+ return 0;
+}
+
+static unsigned long mt9t112_query_bus_param(struct soc_camera_device *icd)
+{
+ struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
+ struct mt9t112_priv *priv = to_mt9t112(client);
+ struct soc_camera_link *icl = to_soc_camera_link(icd);
+ unsigned long flags = SOCAM_MASTER | SOCAM_VSYNC_ACTIVE_HIGH |
+ SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH;
+
+ flags |= (priv->info->flags & MT9T112_FLAG_PCLK_RISING_EDGE) ?
+ SOCAM_PCLK_SAMPLE_RISING : SOCAM_PCLK_SAMPLE_FALLING;
+
+ if (priv->info->flags & MT9T112_FLAG_DATAWIDTH_8)
+ flags |= SOCAM_DATAWIDTH_8;
+ else
+ flags |= SOCAM_DATAWIDTH_10;
+
+ return soc_camera_apply_sensor_flags(icl, flags);
+}
+
+static struct soc_camera_ops mt9t112_ops = {
+ .set_bus_param = mt9t112_set_bus_param,
+ .query_bus_param = mt9t112_query_bus_param,
+};
+
+/************************************************************************
+
+
+ v4l2_subdev_core_ops
+
+
+************************************************************************/
+static int mt9t112_g_chip_ident(struct v4l2_subdev *sd,
+ struct v4l2_dbg_chip_ident *id)
+{
+ struct i2c_client *client = sd->priv;
+ struct mt9t112_priv *priv = to_mt9t112(client);
+
+ id->ident = priv->model;
+ id->revision = 0;
+
+ return 0;
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int mt9t112_g_register(struct v4l2_subdev *sd,
+ struct v4l2_dbg_register *reg)
+{
+ struct i2c_client *client = sd->priv;
+ int ret;
+
+ reg->size = 2;
+ ret = mt9t112_reg_read(reg->reg);
+ if (ret < 0)
+ return ret;
+
+ reg->val = (__u64)ret;
+
+ return 0;
+}
+
+static int mt9t112_s_register(struct v4l2_subdev *sd,
+ struct v4l2_dbg_register *reg)
+{
+ struct i2c_client *client = sd->priv;
+ int ret;
+
+ mt9t112_reg_write(reg->reg, reg->val);
+
+ return ret;
+}
+#endif
+
+static struct v4l2_subdev_core_ops mt9t112_subdev_core_ops = {
+ .g_chip_ident = mt9t112_g_chip_ident,
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+ .g_register = mt9t112_g_register,
+ .s_register = mt9t112_s_register,
+#endif
+};
+
+
+/************************************************************************
+
+
+ v4l2_subdev_video_ops
+
+
+************************************************************************/
+static int mt9t112_s_stream(struct v4l2_subdev *sd, int enable)
+{
+ struct i2c_client *client = sd->priv;
+ struct mt9t112_priv *priv = to_mt9t112(client);
+ int ret = 0;
+
+ if (!enable) {
+ /* FIXME
+ *
+ * If user selected large output size,
+ * and used it long time,
+ * mt9t112 camera will be very warm.
+ *
+ * But current driver can not stop mt9t112 camera.
+ * So, set small size here to solve this problem.
+ */
+ mt9t112_set_a_frame_size(client, VGA_WIDTH, VGA_HEIGHT);
+ return ret;
+ }
+
+ if (!(priv->flags & INIT_DONE)) {
+ u16 param = (MT9T112_FLAG_PCLK_RISING_EDGE &
+ priv->info->flags) ? 0x0001 : 0x0000;
+
+ ECHECKER(mt9t112_init_camera(client));
+
+ /* Invert PCLK (Data sampled on falling edge of pixclk) */
+ mt9t112_reg_write(0x3C20, param);
+
+ mdelay(5);
+
+ priv->flags |= INIT_DONE;
+ }
+
+ mt9t112_mcu_write(VAR(26, 7), priv->format->fmt);
+ mt9t112_mcu_write(VAR(26, 9), priv->format->order);
+ mt9t112_mcu_write(VAR8(1, 0), 0x06);
+
+ mt9t112_set_a_frame_size(client,
+ priv->frame.width,
+ priv->frame.height);
+
+ ECHECKER(mt9t112_auto_focus_trigger(client));
+
+ dev_dbg(&client->dev, "format : %d\n", priv->format->code);
+ dev_dbg(&client->dev, "size : %d x %d\n",
+ priv->frame.width,
+ priv->frame.height);
+
+ CLOCK_INFO(client, EXT_CLOCK);
+
+ return ret;
+}
+
+static int mt9t112_set_params(struct i2c_client *client, u32 width, u32 height,
+ enum v4l2_imgbus_pixelcode code)
+{
+ struct mt9t112_priv *priv = to_mt9t112(client);
+ int i;
+
+ priv->format = NULL;
+
+ /*
+ * frame size check
+ */
+ mt9t112_freame_check(&width, &height);
+
+ priv->frame.width = (u16)width;
+ priv->frame.height = (u16)height;
+
+ /*
+ * get color format
+ */
+ for (i = 0; i < ARRAY_SIZE(mt9t112_cfmts); i++) {
+ if (code == mt9t112_cfmts[i].code) {
+ priv->format = mt9t112_cfmts + i;
+ break;
+ }
+ }
+ if (!priv->format)
+ return -EINVAL;
+
+ return 0;
+}
+
+static int mt9t112_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
+{
+ a->bounds.left = 0;
+ a->bounds.top = 0;
+ a->bounds.width = VGA_WIDTH;
+ a->bounds.height = VGA_HEIGHT;
+ a->defrect = a->bounds;
+ a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ a->pixelaspect.numerator = 1;
+ a->pixelaspect.denominator = 1;
+
+ return 0;
+}
+
+static int mt9t112_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
+{
+ a->c.left = 0;
+ a->c.top = 0;
+ a->c.width = VGA_WIDTH;
+ a->c.height = VGA_HEIGHT;
+ a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+ return 0;
+}
+
+static int mt9t112_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
+{
+ struct i2c_client *client = sd->priv;
+ struct v4l2_rect *rect = &a->c;
+
+ return mt9t112_set_params(client, rect->width, rect->height,
+ V4L2_IMGBUS_FMT_UYVY);
+}
+
+static int mt9t112_g_fmt(struct v4l2_subdev *sd,
+ struct v4l2_imgbus_framefmt *imgf)
+{
+ struct i2c_client *client = sd->priv;
+ struct mt9t112_priv *priv = to_mt9t112(client);
+
+ if (!priv->format) {
+ int ret = mt9t112_set_params(client, VGA_WIDTH, VGA_HEIGHT,
+ V4L2_IMGBUS_FMT_UYVY);
+ if (ret < 0)
+ return ret;
+ }
+
+ imgf->width = priv->frame.width;
+ imgf->height = priv->frame.height;
+ imgf->code = priv->format->code;
+ imgf->field = V4L2_FIELD_NONE;
+
+ return 0;
+}
+
+static int mt9t112_s_fmt(struct v4l2_subdev *sd,
+ struct v4l2_imgbus_framefmt *imgf)
+{
+ struct i2c_client *client = sd->priv;
+
+ return mt9t112_set_params(client, imgf->width, imgf->height,
+ imgf->code);
+}
+
+static int mt9t112_try_fmt(struct v4l2_subdev *sd,
+ struct v4l2_imgbus_framefmt *imgf)
+{
+ mt9t112_freame_check(&imgf->width, &imgf->height);
+
+ imgf->field = V4L2_FIELD_NONE;
+
+ return 0;
+}
+
+static int mt9t112_enum_fmt(struct v4l2_subdev *sd, int index,
+ enum v4l2_imgbus_pixelcode *code)
+{
+ if ((unsigned int)index >= ARRAY_SIZE(mt9t112_cfmts))
+ return -EINVAL;
+
+ *code = mt9t112_cfmts[index].code;
+ return 0;
+}
+
+static struct v4l2_subdev_video_ops mt9t112_subdev_video_ops = {
+ .s_stream = mt9t112_s_stream,
+ .g_imgbus_fmt = mt9t112_g_fmt,
+ .s_imgbus_fmt = mt9t112_s_fmt,
+ .try_imgbus_fmt = mt9t112_try_fmt,
+ .cropcap = mt9t112_cropcap,
+ .g_crop = mt9t112_g_crop,
+ .s_crop = mt9t112_s_crop,
+ .enum_imgbus_fmt = mt9t112_enum_fmt,
+};
+
+/************************************************************************
+
+
+ i2c driver
+
+
+************************************************************************/
+static struct v4l2_subdev_ops mt9t112_subdev_ops = {
+ .core = &mt9t112_subdev_core_ops,
+ .video = &mt9t112_subdev_video_ops,
+};
+
+static int mt9t112_camera_probe(struct soc_camera_device *icd,
+ struct i2c_client *client)
+{
+ struct mt9t112_priv *priv = to_mt9t112(client);
+ const char *devname;
+ int chipid;
+
+ /*
+ * We must have a parent by now. And it cannot be a wrong one.
+ * So this entire test is completely redundant.
+ */
+ if (!icd->dev.parent ||
+ to_soc_camera_host(icd->dev.parent)->nr != icd->iface)
+ return -ENODEV;
+
+ /*
+ * check and show chip ID
+ */
+ chipid = mt9t112_reg_read(0x0000);
+ if (chipid < 0)
+ return -EIO;
+
+ switch (chipid) {
+ case 0x2680:
+ devname = "mt9t111";
+ priv->model = V4L2_IDENT_MT9T111;
+ break;
+ case 0x2682:
+ devname = "mt9t112";
+ priv->model = V4L2_IDENT_MT9T112;
+ break;
+ default:
+ dev_err(&client->dev, "Product ID error %04x\n", chipid);
+ return -ENODEV;
+ }
+
+ dev_info(&client->dev, "%s chip ID %04x\n", devname, chipid);
+
+ return 0;
+}
+
+static int mt9t112_probe(struct i2c_client *client,
+ const struct i2c_device_id *did)
+{
+ struct mt9t112_priv *priv;
+ struct soc_camera_device *icd = client->dev.platform_data;
+ struct i2c_adapter *adapter;
+ struct soc_camera_link *icl;
+ int ret;
+
+ if (!icd) {
+ dev_err(&client->dev, "mt9t112: missing soc-camera data!\n");
+ return -EINVAL;
+ }
+
+ icl = to_soc_camera_link(icd);
+ if (!icl || !icl->priv)
+ return -EINVAL;
+
+ adapter = to_i2c_adapter(client->dev.parent);
+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+ dev_err(&adapter->dev,
+ "I2C-Adapter doesn't support "
+ "I2C_FUNC_SMBUS_BYTE_DATA\n");
+ return -EIO;
+ }
+
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+ priv->info = icl->priv;
+
+ v4l2_i2c_subdev_init(&priv->subdev, client, &mt9t112_subdev_ops);
+
+ icd->ops = &mt9t112_ops;
+
+ ret = mt9t112_camera_probe(icd, client);
+ if (ret) {
+ icd->ops = NULL;
+ i2c_set_clientdata(client, NULL);
+ kfree(priv);
+ }
+
+ return ret;
+}
+
+static int mt9t112_remove(struct i2c_client *client)
+{
+ struct mt9t112_priv *priv = to_mt9t112(client);
+ struct soc_camera_device *icd = client->dev.platform_data;
+
+ icd->ops = NULL;
+ i2c_set_clientdata(client, NULL);
+ kfree(priv);
+ return 0;
+}
+
+static const struct i2c_device_id mt9t112_id[] = {
+ { "mt9t112", 0 },
+ { }
+};
+MODULE_DEVICE_TABLE(i2c, mt9t112_id);
+
+static struct i2c_driver mt9t112_i2c_driver = {
+ .driver = {
+ .name = "mt9t112",
+ },
+ .probe = mt9t112_probe,
+ .remove = mt9t112_remove,
+ .id_table = mt9t112_id,
+};
+
+/************************************************************************
+
+
+ module function
+
+
+************************************************************************/
+static int __init mt9t112_module_init(void)
+{
+ return i2c_add_driver(&mt9t112_i2c_driver);
+}
+
+static void __exit mt9t112_module_exit(void)
+{
+ i2c_del_driver(&mt9t112_i2c_driver);
+}
+
+module_init(mt9t112_module_init);
+module_exit(mt9t112_module_exit);
+
+MODULE_DESCRIPTION("SoC Camera driver for mt9t112");
+MODULE_AUTHOR("Kuninori Morimoto");
+MODULE_LICENSE("GPL v2");
new file mode 100644
@@ -0,0 +1,32 @@
+/* mt9t112 Camera
+ *
+ * Copyright (C) 2009 Renesas Solutions Corp.
+ * Kuninori Morimoto <morimoto.kuninori@renesas.com>
+ *
+ * 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 __MT9T112_H__
+#define __MT9T112_H__
+
+#include <media/soc_camera.h>
+
+#define MT9T112_FLAG_PCLK_RISING_EDGE (1 << 0)
+#define MT9T112_FLAG_DATAWIDTH_8 (1 << 1) /* default width is 10 */
+
+struct mt9t112_pll_divider {
+ u8 m, n;
+ u8 p1, p2, p3, p4, p5, p6, p7;
+};
+
+/*
+ * mt9t112 camera info
+ */
+struct mt9t112_camera_info {
+ u32 flags;
+ struct mt9t112_pll_divider divider;
+};
+
+#endif /* __MT9T112_H__ */
@@ -248,6 +248,8 @@ enum {
V4L2_IDENT_MT9V022IX7ATC = 45010, /* No way to detect "normal" I77ATx */
V4L2_IDENT_MT9V022IX7ATM = 45015, /* and "lead free" IA7ATx chips */
V4L2_IDENT_MT9T031 = 45020,
+ V4L2_IDENT_MT9T111 = 45021,
+ V4L2_IDENT_MT9T112 = 45022,
V4L2_IDENT_MT9V111 = 45031,
V4L2_IDENT_MT9V112 = 45032,