From 066b16478ede808f74a126d8bced0785af064d8b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 1 Jun 2011 23:49:45 +0200 Subject: linux-omap 2.6.39: add right set of camera patches Signed-off-by: Koen Kooi --- ...d-driver-for-Aptina-Micron-mt9p031-sensor.patch | 859 +++++++++++++++++++ .../camera/0001-Add-mt9p031-sensor-support.patch | 951 --------------------- .../0001-v4l-Add-mt9v032-sensor-driver.patch | 853 ------------------ ...GLE-Add-support-for-mt9p031-sensor-driver.patch | 162 ---- .../0002-v4l-Add-mt9v032-sensor-driver.patch | 853 ++++++++++++++++++ ...-for-mt9p031-LI-5M03-module-in-Beagleboar.patch | 162 ++++ 6 files changed, 1874 insertions(+), 1966 deletions(-) create mode 100644 recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-driver-for-Aptina-Micron-mt9p031-sensor.patch delete mode 100644 recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch delete mode 100644 recipes-kernel/linux/linux-omap-2.6.39/camera/0001-v4l-Add-mt9v032-sensor-driver.patch delete mode 100644 recipes-kernel/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch create mode 100644 recipes-kernel/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch create mode 100644 recipes-kernel/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch diff --git a/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-driver-for-Aptina-Micron-mt9p031-sensor.patch b/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-driver-for-Aptina-Micron-mt9p031-sensor.patch new file mode 100644 index 00000000..b0d87361 --- /dev/null +++ b/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-driver-for-Aptina-Micron-mt9p031-sensor.patch @@ -0,0 +1,859 @@ +From bb84d2eef0f0487c4bcdf06e45dd64821de27b44 Mon Sep 17 00:00:00 2001 +From: Javier Martin +Date: Wed, 1 Jun 2011 17:36:48 +0200 +Subject: [PATCH 1/3] Add driver for Aptina (Micron) mt9p031 sensor. + +Clock frequency of 57MHz used in previous version was wrong since +when VDD_IO is 1.8V it can only support 48MHz. + +Two new platform flags have been added: + +- vdd_io: indicates whether the chip is powered with 1.8 or 2.8 VDD_IO. +So that it can use the maximum allowed frequency. +- version: monochrome and color versions of the chip have exactly +the same ID, so the only way to select one of them is through +platform data. + +Internal PLL is now used to generate PIXCLK depending on VDD_IO. + +Signed-off-by: Javier Martin +--- + drivers/media/video/Kconfig | 7 + + drivers/media/video/Makefile | 1 + + drivers/media/video/mt9p031.c | 763 +++++++++++++++++++++++++++++++++++++++++ + include/media/mt9p031.h | 23 ++ + 4 files changed, 794 insertions(+), 0 deletions(-) + create mode 100644 drivers/media/video/mt9p031.c + create mode 100644 include/media/mt9p031.h + +diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig +index 00f51dd..cb87e35 100644 +--- a/drivers/media/video/Kconfig ++++ b/drivers/media/video/Kconfig +@@ -329,6 +329,13 @@ config VIDEO_OV7670 + OV7670 VGA camera. It currently only works with the M88ALP01 + controller. + ++config VIDEO_MT9P031 ++ tristate "Aptina MT9P031 support" ++ depends on I2C && VIDEO_V4L2 ++ ---help--- ++ This is a Video4Linux2 sensor-level driver for the Aptina ++ (Micron) mt9p031 5 Mpixel camera. ++ + config VIDEO_MT9V011 + tristate "Micron mt9v011 sensor support" + depends on I2C && VIDEO_V4L2 +diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile +index ace5d8b..912b29b 100644 +--- a/drivers/media/video/Makefile ++++ b/drivers/media/video/Makefile +@@ -65,6 +65,7 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o + obj-$(CONFIG_VIDEO_OV7670) += ov7670.o + obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o + obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o ++obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o + obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o + obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o + obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o +diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c +new file mode 100644 +index 0000000..cd830b1 +--- /dev/null ++++ b/drivers/media/video/mt9p031.c +@@ -0,0 +1,763 @@ ++/* ++ * Driver for MT9P031 CMOS Image Sensor from Aptina ++ * ++ * Copyright (C) 2011, Javier Martin ++ * ++ * Copyright (C) 2011, Guennadi Liakhovetski ++ * ++ * Based on the MT9V032 driver and Bastian Hecht's code. ++ * ++ * 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 ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#define MT9P031_EXTCLK_FREQ 20000000 ++ ++#define MT9P031_CHIP_VERSION 0x00 ++#define MT9P031_CHIP_VERSION_VALUE 0x1801 ++#define MT9P031_ROW_START 0x01 ++#define MT9P031_ROW_START_MIN 1 ++#define MT9P031_ROW_START_MAX 2004 ++#define MT9P031_ROW_START_DEF 54 ++#define MT9P031_COLUMN_START 0x02 ++#define MT9P031_COLUMN_START_MIN 1 ++#define MT9P031_COLUMN_START_MAX 2750 ++#define MT9P031_COLUMN_START_DEF 16 ++#define MT9P031_WINDOW_HEIGHT 0x03 ++#define MT9P031_WINDOW_HEIGHT_MIN 2 ++#define MT9P031_WINDOW_HEIGHT_MAX 2003 ++#define MT9P031_WINDOW_HEIGHT_DEF 2003 ++#define MT9P031_WINDOW_WIDTH 0x04 ++#define MT9P031_WINDOW_WIDTH_MIN 18 ++#define MT9P031_WINDOW_WIDTH_MAX 2751 ++#define MT9P031_WINDOW_WIDTH_DEF 2751 ++#define MT9P031_H_BLANKING 0x05 ++#define MT9P031_H_BLANKING_VALUE 0 ++#define MT9P031_V_BLANKING 0x06 ++#define MT9P031_V_BLANKING_VALUE 25 ++#define MT9P031_OUTPUT_CONTROL 0x07 ++#define MT9P031_OUTPUT_CONTROL_CEN 2 ++#define MT9P031_OUTPUT_CONTROL_SYN 1 ++#define MT9P031_SHUTTER_WIDTH_UPPER 0x08 ++#define MT9P031_SHUTTER_WIDTH 0x09 ++#define MT9P031_PLL_CONTROL 0x10 ++#define MT9P031_PLL_CONTROL_PWROFF 0x0050 ++#define MT9P031_PLL_CONTROL_PWRON 0x0051 ++#define MT9P031_PLL_CONTROL_USEPLL 0x0052 ++#define MT9P031_PLL_CONFIG_1 0x11 ++#define MT9P031_PLL_CONFIG_1_M_48MHZ 0x5000 ++#define MT9P031_PLL_CONFIG_1_N_48MHZ 0x05 ++#define MT9P031_PLL_CONFIG_1_M_96MHZ 0x3600 ++#define MT9P031_PLL_CONFIG_1_N_96MHZ 0x05 ++#define MT9P031_PLL_CONFIG_2 0x12 ++#define MT9P031_PLL_CONFIG_2_P1_48MHZ 5 ++#define MT9P031_PLL_CONFIG_2_P1_96MHZ 2 ++#define MT9P031_PIXEL_CLOCK_CONTROL 0x0a ++#define MT9P031_FRAME_RESTART 0x0b ++#define MT9P031_SHUTTER_DELAY 0x0c ++#define MT9P031_RST 0x0d ++#define MT9P031_RST_ENABLE 1 ++#define MT9P031_RST_DISABLE 0 ++#define MT9P031_READ_MODE_1 0x1e ++#define MT9P031_READ_MODE_2 0x20 ++#define MT9P031_READ_MODE_2_ROW_MIR 0x8000 ++#define MT9P031_READ_MODE_2_COL_MIR 0x4000 ++#define MT9P031_ROW_ADDRESS_MODE 0x22 ++#define MT9P031_COLUMN_ADDRESS_MODE 0x23 ++#define MT9P031_GLOBAL_GAIN 0x35 ++ ++struct mt9p031 { ++ struct v4l2_subdev subdev; ++ struct media_pad pad; ++ struct v4l2_rect rect; /* Sensor window */ ++ struct v4l2_mbus_framefmt format; ++ struct mt9p031_platform_data *pdata; ++ struct mutex power_lock; /* lock to protect power_count */ ++ int power_count; ++ u16 xskip; ++ u16 yskip; ++ /* cache register values */ ++ u16 output_control; ++}; ++ ++static struct mt9p031 *to_mt9p031(const struct i2c_client *client) ++{ ++ return container_of(i2c_get_clientdata(client), struct mt9p031, subdev); ++} ++ ++static int reg_read(struct i2c_client *client, const u8 reg) ++{ ++ s32 data = i2c_smbus_read_word_data(client, reg); ++ return data < 0 ? data : swab16(data); ++} ++ ++static int reg_write(struct i2c_client *client, const u8 reg, ++ const u16 data) ++{ ++ return i2c_smbus_write_word_data(client, reg, swab16(data)); ++} ++ ++static int mt9p031_set_output_control(struct mt9p031 *mt9p031, u16 clear, ++ u16 set) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ u16 value = (mt9p031->output_control & ~clear) | set; ++ int ret; ++ ++ ret = reg_write(client, MT9P031_OUTPUT_CONTROL, value); ++ if (ret < 0) ++ return ret; ++ mt9p031->output_control = value; ++ return 0; ++} ++ ++static int mt9p031_reset(struct i2c_client *client) ++{ ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ int ret; ++ ++ /* Disable chip output, synchronous option update */ ++ ret = reg_write(client, MT9P031_RST, MT9P031_RST_ENABLE); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_RST, MT9P031_RST_DISABLE); ++ if (ret < 0) ++ return ret; ++ return mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_CEN, 0); ++} ++ ++static int mt9p031_power_on(struct mt9p031 *mt9p031) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ int ret; ++ ++ /* Ensure RESET_BAR is low */ ++ if (mt9p031->pdata->reset) { ++ mt9p031->pdata->reset(&mt9p031->subdev, 1); ++ msleep(1); ++ } ++ /* Emable clock */ ++ if (mt9p031->pdata->set_xclk) ++ mt9p031->pdata->set_xclk(&mt9p031->subdev, MT9P031_EXTCLK_FREQ); ++ /* Now RESET_BAR must be high */ ++ if (mt9p031->pdata->reset) { ++ mt9p031->pdata->reset(&mt9p031->subdev, 0); ++ msleep(1); ++ } ++ /* soft reset */ ++ ret = mt9p031_reset(client); ++ if (ret < 0) { ++ dev_err(&client->dev, "Failed to reset the camera\n"); ++ return ret; ++ } ++ return 0; ++} ++ ++static void mt9p031_power_off(struct mt9p031 *mt9p031) ++{ ++ if (mt9p031->pdata->reset) { ++ mt9p031->pdata->reset(&mt9p031->subdev, 1); ++ msleep(1); ++ } ++ if (mt9p031->pdata->set_xclk) ++ mt9p031->pdata->set_xclk(&mt9p031->subdev, 0); ++} ++ ++static int mt9p031_enum_mbus_code(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_mbus_code_enum *code) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ if (code->pad || code->index) ++ return -EINVAL; ++ ++ code->code = mt9p031->format.code; ++ return 0; ++} ++ ++static struct v4l2_mbus_framefmt *mt9p031_get_pad_format( ++ struct mt9p031 *mt9p031, ++ struct v4l2_subdev_fh *fh, ++ unsigned int pad, u32 which) ++{ ++ switch (which) { ++ case V4L2_SUBDEV_FORMAT_TRY: ++ return v4l2_subdev_get_try_format(fh, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &mt9p031->format; ++ default: ++ return NULL; ++ } ++} ++ ++static struct v4l2_rect *mt9p031_get_pad_crop(struct mt9p031 *mt9p031, ++ struct v4l2_subdev_fh *fh, unsigned int pad, u32 which) ++{ ++ switch (which) { ++ case V4L2_SUBDEV_FORMAT_TRY: ++ return v4l2_subdev_get_try_crop(fh, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &mt9p031->rect; ++ default: ++ return NULL; ++ } ++} ++ ++static int mt9p031_get_crop(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct v4l2_rect *rect = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, ++ crop->which); ++ if (!rect) ++ return -EINVAL; ++ ++ crop->rect = *rect; ++ ++ return 0; ++} ++ ++static u16 mt9p031_skip_for_crop(s32 source, s32 *target, s32 max_skip) ++{ ++ unsigned int skip; ++ ++ if (source - source / 4 < *target) { ++ *target = source; ++ return 1; ++ } ++ ++ skip = DIV_ROUND_CLOSEST(source, *target); ++ if (skip > max_skip) ++ skip = max_skip; ++ *target = 2 * DIV_ROUND_UP(source, 2 * skip); ++ ++ return skip; ++} ++ ++static int mt9p031_set_params(struct i2c_client *client, ++ struct v4l2_rect *rect, u16 xskip, u16 yskip) ++{ ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ int ret; ++ u16 xbin, ybin; ++ const u16 hblank = MT9P031_H_BLANKING_VALUE, ++ vblank = MT9P031_V_BLANKING_VALUE; ++ __s32 left; ++ ++ /* ++ * TODO: Attention! When implementing horizontal flipping, adjust ++ * alignment according to R2 "Column Start" description in the datasheet ++ */ ++ if (xskip & 1) { ++ xbin = 1; ++ left = rect->left & (~3); ++ } else if (xskip & 2) { ++ xbin = 2; ++ left = rect->left & (~7); ++ } else { ++ xbin = 4; ++ left = rect->left & (~15); ++ } ++ ybin = min(yskip, (u16)4); ++ ++ /* Disable register update, reconfigure atomically */ ++ ret = mt9p031_set_output_control(mt9p031, 0, ++ MT9P031_OUTPUT_CONTROL_SYN); ++ if (ret < 0) ++ return ret; ++ ++ dev_dbg(&client->dev, "skip %u:%u, rect %ux%u@%u:%u\n", ++ xskip, yskip, rect->width, rect->height, rect->left, rect->top); ++ ++ /* Blanking and start values - default... */ ++ ret = reg_write(client, MT9P031_H_BLANKING, hblank); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_V_BLANKING, vblank); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_COLUMN_ADDRESS_MODE, ++ ((xbin - 1) << 4) | (xskip - 1)); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_ROW_ADDRESS_MODE, ++ ((ybin - 1) << 4) | (yskip - 1)); ++ if (ret < 0) ++ return ret; ++ ++ dev_dbg(&client->dev, "new physical left %u, top %u\n", ++ rect->left, rect->top); ++ ++ ret = reg_write(client, MT9P031_COLUMN_START, ++ rect->left); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_ROW_START, ++ rect->top); ++ if (ret < 0) ++ return ret; ++ ++ ret = reg_write(client, MT9P031_WINDOW_WIDTH, ++ rect->width - 1); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_WINDOW_HEIGHT, ++ rect->height - 1); ++ if (ret < 0) ++ return ret; ++ ++ /* Re-enable register update, commit all changes */ ++ ret = mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_SYN, 0); ++ if (ret < 0) ++ return ret; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ return ret; ++} ++ ++static int mt9p031_set_crop(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct v4l2_mbus_framefmt *f; ++ struct v4l2_rect *c; ++ struct v4l2_rect rect; ++ u16 xskip, yskip; ++ s32 width, height; ++ ++ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u@%u:%u : %u)\n", ++ __func__, crop->rect.width, crop->rect.height, ++ crop->rect.left, crop->rect.top, crop->which); ++ ++ /* ++ * Clamp the crop rectangle boundaries and align them to a multiple of 2 ++ * pixels. ++ */ ++ rect.width = ALIGN(clamp(crop->rect.width, ++ MT9P031_WINDOW_WIDTH_MIN, ++ MT9P031_WINDOW_WIDTH_MAX), 2); ++ rect.height = ALIGN(clamp(crop->rect.height, ++ MT9P031_WINDOW_HEIGHT_MIN, ++ MT9P031_WINDOW_HEIGHT_MAX), 2); ++ rect.left = ALIGN(clamp(crop->rect.left, ++ MT9P031_COLUMN_START_MIN, ++ MT9P031_COLUMN_START_MAX), 2); ++ rect.top = ALIGN(clamp(crop->rect.top, ++ MT9P031_ROW_START_MIN, ++ MT9P031_ROW_START_MAX), 2); ++ ++ c = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, crop->which); ++ ++ if (rect.width != c->width || rect.height != c->height) { ++ /* ++ * Reset the output image size if the crop rectangle size has ++ * been modified. ++ */ ++ f = mt9p031_get_pad_format(mt9p031, fh, crop->pad, ++ crop->which); ++ width = f->width; ++ height = f->height; ++ ++ xskip = mt9p031_skip_for_crop(rect.width, &width, 7); ++ yskip = mt9p031_skip_for_crop(rect.height, &height, 8); ++ } else { ++ xskip = mt9p031->xskip; ++ yskip = mt9p031->yskip; ++ f = NULL; ++ } ++ if (f) { ++ f->width = width; ++ f->height = height; ++ } ++ ++ *c = rect; ++ crop->rect = rect; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ mt9p031->rect = *c; ++ return 0; ++} ++ ++static int mt9p031_get_format(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *fmt) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ fmt->format = ++ *mt9p031_get_pad_format(mt9p031, fh, fmt->pad, fmt->which); ++ return 0; ++} ++ ++static u16 mt9p031_skip_for_scale(s32 *source, s32 target, ++ s32 max_skip, s32 max) ++{ ++ unsigned int skip; ++ ++ if (*source - *source / 4 < target) { ++ *source = target; ++ return 1; ++ } ++ ++ skip = min(max, *source + target / 2) / target; ++ if (skip > max_skip) ++ skip = max_skip; ++ *source = target * skip; ++ ++ return skip; ++} ++ ++static int mt9p031_set_format(struct v4l2_subdev *sd, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *format) ++{ ++ struct v4l2_mbus_framefmt *__format; ++ struct v4l2_rect *__crop, rect; ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ unsigned int width; ++ unsigned int height; ++ u16 xskip, yskip; ++ ++ __crop = mt9p031_get_pad_crop(mt9p031, fh, format->pad, format->which); ++ ++ width = clamp_t(int, ALIGN(format->format.width, 2), 2, ++ MT9P031_WINDOW_WIDTH_MAX); ++ height = clamp_t(int, ALIGN(format->format.height, 2), 2, ++ MT9P031_WINDOW_HEIGHT_MAX); ++ ++ rect.width = __crop->width; ++ rect.height = __crop->height; ++ ++ xskip = mt9p031_skip_for_scale(&rect.width, width, 7, ++ MT9P031_WINDOW_WIDTH_MAX); ++ if (rect.width + __crop->left > MT9P031_WINDOW_WIDTH_MAX) ++ rect.left = (MT9P031_WINDOW_WIDTH_MAX - rect.width) / 2; ++ else ++ rect.left = __crop->left; ++ yskip = mt9p031_skip_for_scale(&rect.height, height, 8, ++ MT9P031_WINDOW_HEIGHT_MAX); ++ if (rect.height + __crop->top > MT9P031_WINDOW_HEIGHT_MAX) ++ rect.top = (MT9P031_WINDOW_HEIGHT_MAX - rect.height) / 2; ++ else ++ rect.top = __crop->top; ++ ++ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u : %u)\n", __func__, ++ width, height, format->which); ++ if (__crop) ++ *__crop = rect; ++ ++ __format = mt9p031_get_pad_format(mt9p031, fh, format->pad, ++ format->which); ++ __format->width = width; ++ __format->height = height; ++ format->format = *__format; ++ ++ mt9p031->xskip = xskip; ++ mt9p031->yskip = yskip; ++ mt9p031->rect = *__crop; ++ return 0; ++} ++ ++static int mt9p031_pll_enable(struct i2c_client *client) ++{ ++ struct mt9p031 *mt9p031 = to_mt9p031(client); ++ int ret; ++ ++ ret = reg_write(client, MT9P031_PLL_CONTROL, MT9P031_PLL_CONTROL_PWRON); ++ if (ret < 0) ++ return ret; ++ ++ /* Always set the maximum frequency allowed by VDD_IO */ ++ if (mt9p031->pdata->vdd_io == MT9P031_VDD_IO_2V8) { ++ ret = reg_write(client, MT9P031_PLL_CONFIG_1, ++ MT9P031_PLL_CONFIG_1_M_96MHZ | ++ MT9P031_PLL_CONFIG_1_N_96MHZ); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_PLL_CONFIG_2, ++ MT9P031_PLL_CONFIG_2_P1_96MHZ); ++ if (ret < 0) ++ return ret; ++ } else { ++ ret = reg_write(client, MT9P031_PLL_CONFIG_1, ++ MT9P031_PLL_CONFIG_1_M_48MHZ | ++ MT9P031_PLL_CONFIG_1_N_48MHZ); ++ if (ret < 0) ++ return ret; ++ ret = reg_write(client, MT9P031_PLL_CONFIG_2, ++ MT9P031_PLL_CONFIG_2_P1_48MHZ); ++ if (ret < 0) ++ return ret; ++ } ++ mdelay(1); ++ ret = reg_write(client, MT9P031_PLL_CONTROL, ++ MT9P031_PLL_CONTROL_PWRON | ++ MT9P031_PLL_CONTROL_USEPLL); ++ mdelay(1); ++ return ret; ++} ++ ++static inline int mt9p031_pll_disable(struct i2c_client *client) ++{ ++ return reg_write(client, MT9P031_PLL_CONTROL, ++ MT9P031_PLL_CONTROL_PWROFF); ++} ++ ++static int mt9p031_s_stream(struct v4l2_subdev *sd, int enable) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ struct v4l2_rect rect = mt9p031->rect; ++ u16 xskip = mt9p031->xskip; ++ u16 yskip = mt9p031->yskip; ++ int ret; ++ ++ if (enable) { ++ ret = mt9p031_set_params(client, &rect, xskip, yskip); ++ if (ret < 0) ++ return ret; ++ /* Switch to master "normal" mode */ ++ ret = mt9p031_set_output_control(mt9p031, 0, ++ MT9P031_OUTPUT_CONTROL_CEN); ++ if (ret < 0) ++ return ret; ++ ret = mt9p031_pll_enable(client); ++ } else { ++ /* Stop sensor readout */ ++ ret = mt9p031_set_output_control(mt9p031, ++ MT9P031_OUTPUT_CONTROL_CEN, 0); ++ if (ret < 0) ++ return ret; ++ ret = mt9p031_pll_disable(client); ++ } ++ return ret; ++} ++ ++static int mt9p031_video_probe(struct i2c_client *client) ++{ ++ s32 data; ++ ++ /* Read out the chip version register */ ++ data = reg_read(client, MT9P031_CHIP_VERSION); ++ if (data != MT9P031_CHIP_VERSION_VALUE) { ++ dev_err(&client->dev, ++ "No MT9P031 chip detected, register read %x\n", data); ++ return -ENODEV; ++ } ++ ++ dev_info(&client->dev, "Detected a MT9P031 chip ID %x\n", data); ++ ++ return 0; ++} ++ ++static int mt9p031_set_power(struct v4l2_subdev *sd, int on) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ int ret = 0; ++ ++ mutex_lock(&mt9p031->power_lock); ++ ++ /* ++ * If the power count is modified from 0 to != 0 or from != 0 to 0, ++ * update the power state. ++ */ ++ if (mt9p031->power_count == !on) { ++ if (on) { ++ ret = mt9p031_power_on(mt9p031); ++ if (ret) { ++ dev_err(mt9p031->subdev.v4l2_dev->dev, ++ "Failed to power on: %d\n", ret); ++ goto out; ++ } ++ } else { ++ mt9p031_power_off(mt9p031); ++ } ++ } ++ ++ /* Update the power count. */ ++ mt9p031->power_count += on ? 1 : -1; ++ WARN_ON(mt9p031->power_count < 0); ++ ++out: ++ mutex_unlock(&mt9p031->power_lock); ++ return ret; ++} ++ ++static int mt9p031_registered(struct v4l2_subdev *sd) ++{ ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); ++ int ret; ++ ++ ret = mt9p031_set_power(&mt9p031->subdev, 1); ++ if (ret) { ++ dev_err(&client->dev, ++ "Failed to power on device: %d\n", ret); ++ return ret; ++ } ++ ++ ret = mt9p031_video_probe(client); ++ ++ mt9p031_set_power(&mt9p031->subdev, 0); ++ ++ return ret; ++} ++ ++static int mt9p031_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) ++{ ++ struct mt9p031 *mt9p031; ++ mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ mt9p031->rect.width = MT9P031_WINDOW_WIDTH_DEF; ++ mt9p031->rect.height = MT9P031_WINDOW_HEIGHT_DEF; ++ mt9p031->rect.left = MT9P031_COLUMN_START_DEF; ++ mt9p031->rect.top = MT9P031_ROW_START_DEF; ++ ++ if (mt9p031->pdata->version == MT9P031_MONOCHROME_VERSION) ++ mt9p031->format.code = V4L2_MBUS_FMT_Y12_1X12; ++ else ++ mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12; ++ ++ mt9p031->format.width = MT9P031_WINDOW_WIDTH_DEF; ++ mt9p031->format.height = MT9P031_WINDOW_HEIGHT_DEF; ++ mt9p031->format.field = V4L2_FIELD_NONE; ++ mt9p031->format.colorspace = V4L2_COLORSPACE_SRGB; ++ ++ mt9p031->xskip = 1; ++ mt9p031->yskip = 1; ++ return mt9p031_set_power(sd, 1); ++} ++ ++static int mt9p031_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) ++{ ++ return mt9p031_set_power(sd, 0); ++} ++ ++static struct v4l2_subdev_core_ops mt9p031_subdev_core_ops = { ++ .s_power = mt9p031_set_power, ++}; ++ ++static struct v4l2_subdev_video_ops mt9p031_subdev_video_ops = { ++ .s_stream = mt9p031_s_stream, ++}; ++ ++static struct v4l2_subdev_pad_ops mt9p031_subdev_pad_ops = { ++ .enum_mbus_code = mt9p031_enum_mbus_code, ++ .get_fmt = mt9p031_get_format, ++ .set_fmt = mt9p031_set_format, ++ .get_crop = mt9p031_get_crop, ++ .set_crop = mt9p031_set_crop, ++}; ++ ++static struct v4l2_subdev_ops mt9p031_subdev_ops = { ++ .core = &mt9p031_subdev_core_ops, ++ .video = &mt9p031_subdev_video_ops, ++ .pad = &mt9p031_subdev_pad_ops, ++}; ++ ++static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = { ++ .registered = mt9p031_registered, ++ .open = mt9p031_open, ++ .close = mt9p031_close, ++}; ++ ++static int mt9p031_probe(struct i2c_client *client, ++ const struct i2c_device_id *did) ++{ ++ int ret; ++ struct mt9p031 *mt9p031; ++ struct mt9p031_platform_data *pdata = client->dev.platform_data; ++ struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); ++ ++ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) { ++ dev_warn(&adapter->dev, ++ "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n"); ++ return -EIO; ++ } ++ ++ mt9p031 = kzalloc(sizeof(struct mt9p031), GFP_KERNEL); ++ if (!mt9p031) ++ return -ENOMEM; ++ ++ mutex_init(&mt9p031->power_lock); ++ v4l2_i2c_subdev_init(&mt9p031->subdev, client, &mt9p031_subdev_ops); ++ mt9p031->subdev.internal_ops = &mt9p031_subdev_internal_ops; ++ ++ mt9p031->pdata = pdata; ++ ++ mt9p031->pad.flags = MEDIA_PAD_FL_SOURCE; ++ ret = media_entity_init(&mt9p031->subdev.entity, 1, &mt9p031->pad, 0); ++ if (ret) ++ return ret; ++ ++ mt9p031->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; ++ ++ return 0; ++} ++ ++static int mt9p031_remove(struct i2c_client *client) ++{ ++ struct v4l2_subdev *sd = i2c_get_clientdata(client); ++ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); ++ ++ v4l2_device_unregister_subdev(sd); ++ media_entity_cleanup(&sd->entity); ++ kfree(mt9p031); ++ ++ return 0; ++} ++ ++static const struct i2c_device_id mt9p031_id[] = { ++ { "mt9p031", 0 }, ++ { } ++}; ++MODULE_DEVICE_TABLE(i2c, mt9p031_id); ++ ++static struct i2c_driver mt9p031_i2c_driver = { ++ .driver = { ++ .name = "mt9p031", ++ }, ++ .probe = mt9p031_probe, ++ .remove = mt9p031_remove, ++ .id_table = mt9p031_id, ++}; ++ ++static int __init mt9p031_mod_init(void) ++{ ++ return i2c_add_driver(&mt9p031_i2c_driver); ++} ++ ++static void __exit mt9p031_mod_exit(void) ++{ ++ i2c_del_driver(&mt9p031_i2c_driver); ++} ++ ++module_init(mt9p031_mod_init); ++module_exit(mt9p031_mod_exit); ++ ++MODULE_DESCRIPTION("Aptina MT9P031 Camera driver"); ++MODULE_AUTHOR("Bastian Hecht "); ++MODULE_LICENSE("GPL v2"); +diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h +new file mode 100644 +index 0000000..27b4c75 +--- /dev/null ++++ b/include/media/mt9p031.h +@@ -0,0 +1,23 @@ ++#ifndef MT9P031_H ++#define MT9P031_H ++ ++struct v4l2_subdev; ++ ++enum { ++ MT9P031_COLOR_VERSION = 0, ++ MT9P031_MONOCHROME_VERSION = 1, ++}; ++ ++enum { ++ MT9P031_VDD_IO_1V8 = 0, ++ MT9P031_VDD_IO_2V8 = 1, ++}; ++ ++struct mt9p031_platform_data { ++ int (*set_xclk)(struct v4l2_subdev *subdev, int hz); ++ int (*reset)(struct v4l2_subdev *subdev, int active); ++ int vdd_io; /* MT9P031_VDD_IO_1V8 or MT9P031_VDD_IO_2V8 */ ++ int version; /* MT9P031_COLOR_VERSION or MT9P031_MONOCHROME_VERSION */ ++}; ++ ++#endif +-- +1.6.6.1 + diff --git a/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch b/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch deleted file mode 100644 index 854ccdc1..00000000 --- a/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch +++ /dev/null @@ -1,951 +0,0 @@ -Delivered-To: koen@beagleboard.org -Received: by 10.151.113.15 with SMTP id q15cs142302ybm; - Wed, 1 Jun 2011 08:40:02 -0700 (PDT) -Received: by 10.101.218.19 with SMTP id v19mr4614809anq.152.1306942801792; - Wed, 01 Jun 2011 08:40:01 -0700 (PDT) -Return-Path: -Received: from mail-gw0-f56.google.com (mail-gw0-f56.google.com [74.125.83.56]) - by mx.google.com with ESMTPS id q9si2830757ani.54.2011.06.01.08.40.00 - (version=TLSv1/SSLv3 cipher=OTHER); - Wed, 01 Jun 2011 08:40:00 -0700 (PDT) -Received-SPF: pass (google.com: domain of beagleboard+bncCLbVq8bYBxDHupnvBBoErrmKKA@googlegroups.com designates 74.125.83.56 as permitted sender) client-ip=74.125.83.56; -Authentication-Results: mx.google.com; spf=pass (google.com: domain of beagleboard+bncCLbVq8bYBxDHupnvBBoErrmKKA@googlegroups.com designates 74.125.83.56 as permitted sender) smtp.mail=beagleboard+bncCLbVq8bYBxDHupnvBBoErrmKKA@googlegroups.com; dkim=pass (test mode) header.i=@googlegroups.com -Received: by gwaa11 with SMTP id a11sf7473558gwa.11 - for ; Wed, 01 Jun 2011 08:40:00 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=googlegroups.com; s=beta; - h=domainkey-signature:mime-version:x-beenthere:received-spf:from:to - :cc:subject:date:message-id:x-mailer:x-original-sender - :x-original-authentication-results:reply-to:precedence:mailing-list - :list-id:x-google-group-id:list-post:list-help:list-archive:sender - :list-unsubscribe:content-type; - bh=YBNkufpLpgUhP0Ja/p5xbR4lygvbGJf0W+WAfI5IdB4=; - b=iZQ8TroGI9c5zX6Vw7INxR2O7jT5tg6fO4GUDr3lxYXfWP0o3J/E4yqZ8zZwb9bxmI - gXtiV1FBeOjS0u6+ZrrqCt9HtCMEKFHMI4kYdoD2ABO1pjAXmL6lQtMYgYWM9j+RNIrk - F1mzfEnykk+pYvLCfPf5UU7QbhoSCd1Oc5pv0= -DomainKey-Signature: a=rsa-sha1; c=nofws; - d=googlegroups.com; s=beta; - h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date - :message-id:x-mailer:x-original-sender - :x-original-authentication-results:reply-to:precedence:mailing-list - :list-id:x-google-group-id:list-post:list-help:list-archive:sender - :list-unsubscribe:content-type; - b=40K6jHETfDcMlLEICg+kctIZRvOz6uePTaKT9ZUCteaABL3LZMqHmFe/MEqyr2+chL - KsyhPXLjKwYXTz1Qut5mn+PeALOQZYNDlWk8x0hAlQbiM7ydGppZMWyTs+N6q3hUTY1z - jzGEUEKgH+QrbcNJwR7jEXpbLiMaQrxsIVlVI= -Received: by 10.91.101.12 with SMTP id d12mr1050131agm.33.1306942797975; - Wed, 01 Jun 2011 08:39:57 -0700 (PDT) -MIME-Version: 1.0 -X-BeenThere: beagleboard@googlegroups.com -Received: by 10.101.212.20 with SMTP id o20ls99205anq.3.gmail; Wed, 01 Jun - 2011 08:39:51 -0700 (PDT) -Received: by 10.236.141.14 with SMTP id f14mr4899631yhj.62.1306942791154; - Wed, 01 Jun 2011 08:39:51 -0700 (PDT) -Received: by 10.150.33.26 with SMTP id g26msybg; - Wed, 1 Jun 2011 08:37:12 -0700 (PDT) -Received: by 10.42.140.134 with SMTP id k6mr2743913icu.80.1306942632159; - Wed, 01 Jun 2011 08:37:12 -0700 (PDT) -Received: by 10.42.140.134 with SMTP id k6mr2743912icu.80.1306942632143; - Wed, 01 Jun 2011 08:37:12 -0700 (PDT) -Received: from mail-wy0-f170.google.com (mail-wy0-f170.google.com [74.125.82.170]) - by gmr-mx.google.com with ESMTPS id c14si398207icn.7.2011.06.01.08.37.10 - (version=TLSv1/SSLv3 cipher=OTHER); - Wed, 01 Jun 2011 08:37:10 -0700 (PDT) -Received-SPF: neutral (google.com: 74.125.82.170 is neither permitted nor denied by best guess record for domain of javier.martin@vista-silicon.com) client-ip=74.125.82.170; -Received: by mail-wy0-f170.google.com with SMTP id 34so8538295wyb.1 - for ; Wed, 01 Jun 2011 08:37:10 -0700 (PDT) -Received: by 10.227.165.10 with SMTP id g10mr7741970wby.91.1306942629902; - Wed, 01 Jun 2011 08:37:09 -0700 (PDT) -Received: from localhost.localdomain (242.51.18.95.dynamic.jazztel.es [95.18.51.242]) - by mx.google.com with ESMTPS id fw15sm820685wbb.61.2011.06.01.08.37.01 - (version=TLSv1/SSLv3 cipher=OTHER); - Wed, 01 Jun 2011 08:37:08 -0700 (PDT) -From: Javier Martin -To: linux-media@vger.kernel.org -Cc: g.liakhovetski@gmx.de, - laurent.pinchart@ideasonboard.com, - carlighting@yahoo.co.nz, - beagleboard@googlegroups.com, - mch_kot@yahoo.com.cn, - Javier Martin -Subject: [beagleboard] [PATCH v6 1/2] Add driver for Aptina (Micron) mt9p031 sensor. -Date: Wed, 1 Jun 2011 17:36:48 +0200 -Message-Id: <1306942609-2440-1-git-send-email-javier.martin@vista-silicon.com> -X-Mailer: git-send-email 1.7.0.4 -X-Original-Sender: javier.martin@vista-silicon.com -X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: - 74.125.82.170 is neither permitted nor denied by best guess record for domain - of javier.martin@vista-silicon.com) smtp.mail=javier.martin@vista-silicon.com -Reply-To: beagleboard@googlegroups.com -Precedence: list -Mailing-list: list beagleboard@googlegroups.com; contact beagleboard+owners@googlegroups.com -List-ID: -X-Google-Group-Id: 1035534660134 -List-Post: , -List-Help: , -List-Archive: -Sender: beagleboard@googlegroups.com -List-Unsubscribe: , - -Content-Type: text/plain; charset=ISO-8859-1 - -Clock frequency of 57MHz used in previous version was wrong since -when VDD_IO is 1.8V it can only support 48MHz. - -Two new platform flags have been added: - -- vdd_io: indicates whether the chip is powered with 1.8 or 2.8 VDD_IO. -So that it can use the maximum allowed frequency. -- version: monochrome and color versions of the chip have exactly -the same ID, so the only way to select one of them is through -platform data. - -Internal PLL is now used to generate PIXCLK depending on VDD_IO. - -Signed-off-by: Javier Martin ---- - drivers/media/video/Kconfig | 7 + - drivers/media/video/Makefile | 1 + - drivers/media/video/mt9p031.c | 763 +++++++++++++++++++++++++++++++++++++++++ - include/media/mt9p031.h | 23 ++ - 4 files changed, 794 insertions(+), 0 deletions(-) - create mode 100644 drivers/media/video/mt9p031.c - create mode 100644 include/media/mt9p031.h - -diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig -index 00f51dd..cb87e35 100644 ---- a/drivers/media/video/Kconfig -+++ b/drivers/media/video/Kconfig -@@ -329,6 +329,13 @@ config VIDEO_OV7670 - OV7670 VGA camera. It currently only works with the M88ALP01 - controller. - -+config VIDEO_MT9P031 -+ tristate "Aptina MT9P031 support" -+ depends on I2C && VIDEO_V4L2 -+ ---help--- -+ This is a Video4Linux2 sensor-level driver for the Aptina -+ (Micron) mt9p031 5 Mpixel camera. -+ - config VIDEO_MT9V011 - tristate "Micron mt9v011 sensor support" - depends on I2C && VIDEO_V4L2 -diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile -index ace5d8b..912b29b 100644 ---- a/drivers/media/video/Makefile -+++ b/drivers/media/video/Makefile -@@ -65,6 +65,7 @@ obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o - obj-$(CONFIG_VIDEO_OV7670) += ov7670.o - obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o - obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o -+obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o - obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o - obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o - obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o -diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c -new file mode 100644 -index 0000000..cd830b1 ---- /dev/null -+++ b/drivers/media/video/mt9p031.c -@@ -0,0 +1,763 @@ -+/* -+ * Driver for MT9P031 CMOS Image Sensor from Aptina -+ * -+ * Copyright (C) 2011, Javier Martin -+ * -+ * Copyright (C) 2011, Guennadi Liakhovetski -+ * -+ * Based on the MT9V032 driver and Bastian Hecht's code. -+ * -+ * 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 -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#define MT9P031_EXTCLK_FREQ 20000000 -+ -+#define MT9P031_CHIP_VERSION 0x00 -+#define MT9P031_CHIP_VERSION_VALUE 0x1801 -+#define MT9P031_ROW_START 0x01 -+#define MT9P031_ROW_START_MIN 1 -+#define MT9P031_ROW_START_MAX 2004 -+#define MT9P031_ROW_START_DEF 54 -+#define MT9P031_COLUMN_START 0x02 -+#define MT9P031_COLUMN_START_MIN 1 -+#define MT9P031_COLUMN_START_MAX 2750 -+#define MT9P031_COLUMN_START_DEF 16 -+#define MT9P031_WINDOW_HEIGHT 0x03 -+#define MT9P031_WINDOW_HEIGHT_MIN 2 -+#define MT9P031_WINDOW_HEIGHT_MAX 2003 -+#define MT9P031_WINDOW_HEIGHT_DEF 2003 -+#define MT9P031_WINDOW_WIDTH 0x04 -+#define MT9P031_WINDOW_WIDTH_MIN 18 -+#define MT9P031_WINDOW_WIDTH_MAX 2751 -+#define MT9P031_WINDOW_WIDTH_DEF 2751 -+#define MT9P031_H_BLANKING 0x05 -+#define MT9P031_H_BLANKING_VALUE 0 -+#define MT9P031_V_BLANKING 0x06 -+#define MT9P031_V_BLANKING_VALUE 25 -+#define MT9P031_OUTPUT_CONTROL 0x07 -+#define MT9P031_OUTPUT_CONTROL_CEN 2 -+#define MT9P031_OUTPUT_CONTROL_SYN 1 -+#define MT9P031_SHUTTER_WIDTH_UPPER 0x08 -+#define MT9P031_SHUTTER_WIDTH 0x09 -+#define MT9P031_PLL_CONTROL 0x10 -+#define MT9P031_PLL_CONTROL_PWROFF 0x0050 -+#define MT9P031_PLL_CONTROL_PWRON 0x0051 -+#define MT9P031_PLL_CONTROL_USEPLL 0x0052 -+#define MT9P031_PLL_CONFIG_1 0x11 -+#define MT9P031_PLL_CONFIG_1_M_48MHZ 0x5000 -+#define MT9P031_PLL_CONFIG_1_N_48MHZ 0x05 -+#define MT9P031_PLL_CONFIG_1_M_96MHZ 0x3600 -+#define MT9P031_PLL_CONFIG_1_N_96MHZ 0x05 -+#define MT9P031_PLL_CONFIG_2 0x12 -+#define MT9P031_PLL_CONFIG_2_P1_48MHZ 5 -+#define MT9P031_PLL_CONFIG_2_P1_96MHZ 2 -+#define MT9P031_PIXEL_CLOCK_CONTROL 0x0a -+#define MT9P031_FRAME_RESTART 0x0b -+#define MT9P031_SHUTTER_DELAY 0x0c -+#define MT9P031_RST 0x0d -+#define MT9P031_RST_ENABLE 1 -+#define MT9P031_RST_DISABLE 0 -+#define MT9P031_READ_MODE_1 0x1e -+#define MT9P031_READ_MODE_2 0x20 -+#define MT9P031_READ_MODE_2_ROW_MIR 0x8000 -+#define MT9P031_READ_MODE_2_COL_MIR 0x4000 -+#define MT9P031_ROW_ADDRESS_MODE 0x22 -+#define MT9P031_COLUMN_ADDRESS_MODE 0x23 -+#define MT9P031_GLOBAL_GAIN 0x35 -+ -+struct mt9p031 { -+ struct v4l2_subdev subdev; -+ struct media_pad pad; -+ struct v4l2_rect rect; /* Sensor window */ -+ struct v4l2_mbus_framefmt format; -+ struct mt9p031_platform_data *pdata; -+ struct mutex power_lock; /* lock to protect power_count */ -+ int power_count; -+ u16 xskip; -+ u16 yskip; -+ /* cache register values */ -+ u16 output_control; -+}; -+ -+static struct mt9p031 *to_mt9p031(const struct i2c_client *client) -+{ -+ return container_of(i2c_get_clientdata(client), struct mt9p031, subdev); -+} -+ -+static int reg_read(struct i2c_client *client, const u8 reg) -+{ -+ s32 data = i2c_smbus_read_word_data(client, reg); -+ return data < 0 ? data : swab16(data); -+} -+ -+static int reg_write(struct i2c_client *client, const u8 reg, -+ const u16 data) -+{ -+ return i2c_smbus_write_word_data(client, reg, swab16(data)); -+} -+ -+static int mt9p031_set_output_control(struct mt9p031 *mt9p031, u16 clear, -+ u16 set) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ u16 value = (mt9p031->output_control & ~clear) | set; -+ int ret; -+ -+ ret = reg_write(client, MT9P031_OUTPUT_CONTROL, value); -+ if (ret < 0) -+ return ret; -+ mt9p031->output_control = value; -+ return 0; -+} -+ -+static int mt9p031_reset(struct i2c_client *client) -+{ -+ struct mt9p031 *mt9p031 = to_mt9p031(client); -+ int ret; -+ -+ /* Disable chip output, synchronous option update */ -+ ret = reg_write(client, MT9P031_RST, MT9P031_RST_ENABLE); -+ if (ret < 0) -+ return ret; -+ ret = reg_write(client, MT9P031_RST, MT9P031_RST_DISABLE); -+ if (ret < 0) -+ return ret; -+ return mt9p031_set_output_control(mt9p031, -+ MT9P031_OUTPUT_CONTROL_CEN, 0); -+} -+ -+static int mt9p031_power_on(struct mt9p031 *mt9p031) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ int ret; -+ -+ /* Ensure RESET_BAR is low */ -+ if (mt9p031->pdata->reset) { -+ mt9p031->pdata->reset(&mt9p031->subdev, 1); -+ msleep(1); -+ } -+ /* Emable clock */ -+ if (mt9p031->pdata->set_xclk) -+ mt9p031->pdata->set_xclk(&mt9p031->subdev, MT9P031_EXTCLK_FREQ); -+ /* Now RESET_BAR must be high */ -+ if (mt9p031->pdata->reset) { -+ mt9p031->pdata->reset(&mt9p031->subdev, 0); -+ msleep(1); -+ } -+ /* soft reset */ -+ ret = mt9p031_reset(client); -+ if (ret < 0) { -+ dev_err(&client->dev, "Failed to reset the camera\n"); -+ return ret; -+ } -+ return 0; -+} -+ -+static void mt9p031_power_off(struct mt9p031 *mt9p031) -+{ -+ if (mt9p031->pdata->reset) { -+ mt9p031->pdata->reset(&mt9p031->subdev, 1); -+ msleep(1); -+ } -+ if (mt9p031->pdata->set_xclk) -+ mt9p031->pdata->set_xclk(&mt9p031->subdev, 0); -+} -+ -+static int mt9p031_enum_mbus_code(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_mbus_code_enum *code) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ if (code->pad || code->index) -+ return -EINVAL; -+ -+ code->code = mt9p031->format.code; -+ return 0; -+} -+ -+static struct v4l2_mbus_framefmt *mt9p031_get_pad_format( -+ struct mt9p031 *mt9p031, -+ struct v4l2_subdev_fh *fh, -+ unsigned int pad, u32 which) -+{ -+ switch (which) { -+ case V4L2_SUBDEV_FORMAT_TRY: -+ return v4l2_subdev_get_try_format(fh, pad); -+ case V4L2_SUBDEV_FORMAT_ACTIVE: -+ return &mt9p031->format; -+ default: -+ return NULL; -+ } -+} -+ -+static struct v4l2_rect *mt9p031_get_pad_crop(struct mt9p031 *mt9p031, -+ struct v4l2_subdev_fh *fh, unsigned int pad, u32 which) -+{ -+ switch (which) { -+ case V4L2_SUBDEV_FORMAT_TRY: -+ return v4l2_subdev_get_try_crop(fh, pad); -+ case V4L2_SUBDEV_FORMAT_ACTIVE: -+ return &mt9p031->rect; -+ default: -+ return NULL; -+ } -+} -+ -+static int mt9p031_get_crop(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_crop *crop) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct v4l2_rect *rect = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, -+ crop->which); -+ if (!rect) -+ return -EINVAL; -+ -+ crop->rect = *rect; -+ -+ return 0; -+} -+ -+static u16 mt9p031_skip_for_crop(s32 source, s32 *target, s32 max_skip) -+{ -+ unsigned int skip; -+ -+ if (source - source / 4 < *target) { -+ *target = source; -+ return 1; -+ } -+ -+ skip = DIV_ROUND_CLOSEST(source, *target); -+ if (skip > max_skip) -+ skip = max_skip; -+ *target = 2 * DIV_ROUND_UP(source, 2 * skip); -+ -+ return skip; -+} -+ -+static int mt9p031_set_params(struct i2c_client *client, -+ struct v4l2_rect *rect, u16 xskip, u16 yskip) -+{ -+ struct mt9p031 *mt9p031 = to_mt9p031(client); -+ int ret; -+ u16 xbin, ybin; -+ const u16 hblank = MT9P031_H_BLANKING_VALUE, -+ vblank = MT9P031_V_BLANKING_VALUE; -+ __s32 left; -+ -+ /* -+ * TODO: Attention! When implementing horizontal flipping, adjust -+ * alignment according to R2 "Column Start" description in the datasheet -+ */ -+ if (xskip & 1) { -+ xbin = 1; -+ left = rect->left & (~3); -+ } else if (xskip & 2) { -+ xbin = 2; -+ left = rect->left & (~7); -+ } else { -+ xbin = 4; -+ left = rect->left & (~15); -+ } -+ ybin = min(yskip, (u16)4); -+ -+ /* Disable register update, reconfigure atomically */ -+ ret = mt9p031_set_output_control(mt9p031, 0, -+ MT9P031_OUTPUT_CONTROL_SYN); -+ if (ret < 0) -+ return ret; -+ -+ dev_dbg(&client->dev, "skip %u:%u, rect %ux%u@%u:%u\n", -+ xskip, yskip, rect->width, rect->height, rect->left, rect->top); -+ -+ /* Blanking and start values - default... */ -+ ret = reg_write(client, MT9P031_H_BLANKING, hblank); -+ if (ret < 0) -+ return ret; -+ ret = reg_write(client, MT9P031_V_BLANKING, vblank); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_COLUMN_ADDRESS_MODE, -+ ((xbin - 1) << 4) | (xskip - 1)); -+ if (ret < 0) -+ return ret; -+ ret = reg_write(client, MT9P031_ROW_ADDRESS_MODE, -+ ((ybin - 1) << 4) | (yskip - 1)); -+ if (ret < 0) -+ return ret; -+ -+ dev_dbg(&client->dev, "new physical left %u, top %u\n", -+ rect->left, rect->top); -+ -+ ret = reg_write(client, MT9P031_COLUMN_START, -+ rect->left); -+ if (ret < 0) -+ return ret; -+ ret = reg_write(client, MT9P031_ROW_START, -+ rect->top); -+ if (ret < 0) -+ return ret; -+ -+ ret = reg_write(client, MT9P031_WINDOW_WIDTH, -+ rect->width - 1); -+ if (ret < 0) -+ return ret; -+ ret = reg_write(client, MT9P031_WINDOW_HEIGHT, -+ rect->height - 1); -+ if (ret < 0) -+ return ret; -+ -+ /* Re-enable register update, commit all changes */ -+ ret = mt9p031_set_output_control(mt9p031, -+ MT9P031_OUTPUT_CONTROL_SYN, 0); -+ if (ret < 0) -+ return ret; -+ -+ mt9p031->xskip = xskip; -+ mt9p031->yskip = yskip; -+ return ret; -+} -+ -+static int mt9p031_set_crop(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_crop *crop) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct v4l2_mbus_framefmt *f; -+ struct v4l2_rect *c; -+ struct v4l2_rect rect; -+ u16 xskip, yskip; -+ s32 width, height; -+ -+ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u@%u:%u : %u)\n", -+ __func__, crop->rect.width, crop->rect.height, -+ crop->rect.left, crop->rect.top, crop->which); -+ -+ /* -+ * Clamp the crop rectangle boundaries and align them to a multiple of 2 -+ * pixels. -+ */ -+ rect.width = ALIGN(clamp(crop->rect.width, -+ MT9P031_WINDOW_WIDTH_MIN, -+ MT9P031_WINDOW_WIDTH_MAX), 2); -+ rect.height = ALIGN(clamp(crop->rect.height, -+ MT9P031_WINDOW_HEIGHT_MIN, -+ MT9P031_WINDOW_HEIGHT_MAX), 2); -+ rect.left = ALIGN(clamp(crop->rect.left, -+ MT9P031_COLUMN_START_MIN, -+ MT9P031_COLUMN_START_MAX), 2); -+ rect.top = ALIGN(clamp(crop->rect.top, -+ MT9P031_ROW_START_MIN, -+ MT9P031_ROW_START_MAX), 2); -+ -+ c = mt9p031_get_pad_crop(mt9p031, fh, crop->pad, crop->which); -+ -+ if (rect.width != c->width || rect.height != c->height) { -+ /* -+ * Reset the output image size if the crop rectangle size has -+ * been modified. -+ */ -+ f = mt9p031_get_pad_format(mt9p031, fh, crop->pad, -+ crop->which); -+ width = f->width; -+ height = f->height; -+ -+ xskip = mt9p031_skip_for_crop(rect.width, &width, 7); -+ yskip = mt9p031_skip_for_crop(rect.height, &height, 8); -+ } else { -+ xskip = mt9p031->xskip; -+ yskip = mt9p031->yskip; -+ f = NULL; -+ } -+ if (f) { -+ f->width = width; -+ f->height = height; -+ } -+ -+ *c = rect; -+ crop->rect = rect; -+ -+ mt9p031->xskip = xskip; -+ mt9p031->yskip = yskip; -+ mt9p031->rect = *c; -+ return 0; -+} -+ -+static int mt9p031_get_format(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_format *fmt) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ fmt->format = -+ *mt9p031_get_pad_format(mt9p031, fh, fmt->pad, fmt->which); -+ return 0; -+} -+ -+static u16 mt9p031_skip_for_scale(s32 *source, s32 target, -+ s32 max_skip, s32 max) -+{ -+ unsigned int skip; -+ -+ if (*source - *source / 4 < target) { -+ *source = target; -+ return 1; -+ } -+ -+ skip = min(max, *source + target / 2) / target; -+ if (skip > max_skip) -+ skip = max_skip; -+ *source = target * skip; -+ -+ return skip; -+} -+ -+static int mt9p031_set_format(struct v4l2_subdev *sd, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_format *format) -+{ -+ struct v4l2_mbus_framefmt *__format; -+ struct v4l2_rect *__crop, rect; -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ unsigned int width; -+ unsigned int height; -+ u16 xskip, yskip; -+ -+ __crop = mt9p031_get_pad_crop(mt9p031, fh, format->pad, format->which); -+ -+ width = clamp_t(int, ALIGN(format->format.width, 2), 2, -+ MT9P031_WINDOW_WIDTH_MAX); -+ height = clamp_t(int, ALIGN(format->format.height, 2), 2, -+ MT9P031_WINDOW_HEIGHT_MAX); -+ -+ rect.width = __crop->width; -+ rect.height = __crop->height; -+ -+ xskip = mt9p031_skip_for_scale(&rect.width, width, 7, -+ MT9P031_WINDOW_WIDTH_MAX); -+ if (rect.width + __crop->left > MT9P031_WINDOW_WIDTH_MAX) -+ rect.left = (MT9P031_WINDOW_WIDTH_MAX - rect.width) / 2; -+ else -+ rect.left = __crop->left; -+ yskip = mt9p031_skip_for_scale(&rect.height, height, 8, -+ MT9P031_WINDOW_HEIGHT_MAX); -+ if (rect.height + __crop->top > MT9P031_WINDOW_HEIGHT_MAX) -+ rect.top = (MT9P031_WINDOW_HEIGHT_MAX - rect.height) / 2; -+ else -+ rect.top = __crop->top; -+ -+ dev_dbg(mt9p031->subdev.v4l2_dev->dev, "%s(%ux%u : %u)\n", __func__, -+ width, height, format->which); -+ if (__crop) -+ *__crop = rect; -+ -+ __format = mt9p031_get_pad_format(mt9p031, fh, format->pad, -+ format->which); -+ __format->width = width; -+ __format->height = height; -+ format->format = *__format; -+ -+ mt9p031->xskip = xskip; -+ mt9p031->yskip = yskip; -+ mt9p031->rect = *__crop; -+ return 0; -+} -+ -+static int mt9p031_pll_enable(struct i2c_client *client) -+{ -+ struct mt9p031 *mt9p031 = to_mt9p031(client); -+ int ret; -+ -+ ret = reg_write(client, MT9P031_PLL_CONTROL, MT9P031_PLL_CONTROL_PWRON); -+ if (ret < 0) -+ return ret; -+ -+ /* Always set the maximum frequency allowed by VDD_IO */ -+ if (mt9p031->pdata->vdd_io == MT9P031_VDD_IO_2V8) { -+ ret = reg_write(client, MT9P031_PLL_CONFIG_1, -+ MT9P031_PLL_CONFIG_1_M_96MHZ | -+ MT9P031_PLL_CONFIG_1_N_96MHZ); -+ if (ret < 0) -+ return ret; -+ ret = reg_write(client, MT9P031_PLL_CONFIG_2, -+ MT9P031_PLL_CONFIG_2_P1_96MHZ); -+ if (ret < 0) -+ return ret; -+ } else { -+ ret = reg_write(client, MT9P031_PLL_CONFIG_1, -+ MT9P031_PLL_CONFIG_1_M_48MHZ | -+ MT9P031_PLL_CONFIG_1_N_48MHZ); -+ if (ret < 0) -+ return ret; -+ ret = reg_write(client, MT9P031_PLL_CONFIG_2, -+ MT9P031_PLL_CONFIG_2_P1_48MHZ); -+ if (ret < 0) -+ return ret; -+ } -+ mdelay(1); -+ ret = reg_write(client, MT9P031_PLL_CONTROL, -+ MT9P031_PLL_CONTROL_PWRON | -+ MT9P031_PLL_CONTROL_USEPLL); -+ mdelay(1); -+ return ret; -+} -+ -+static inline int mt9p031_pll_disable(struct i2c_client *client) -+{ -+ return reg_write(client, MT9P031_PLL_CONTROL, -+ MT9P031_PLL_CONTROL_PWROFF); -+} -+ -+static int mt9p031_s_stream(struct v4l2_subdev *sd, int enable) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ struct v4l2_rect rect = mt9p031->rect; -+ u16 xskip = mt9p031->xskip; -+ u16 yskip = mt9p031->yskip; -+ int ret; -+ -+ if (enable) { -+ ret = mt9p031_set_params(client, &rect, xskip, yskip); -+ if (ret < 0) -+ return ret; -+ /* Switch to master "normal" mode */ -+ ret = mt9p031_set_output_control(mt9p031, 0, -+ MT9P031_OUTPUT_CONTROL_CEN); -+ if (ret < 0) -+ return ret; -+ ret = mt9p031_pll_enable(client); -+ } else { -+ /* Stop sensor readout */ -+ ret = mt9p031_set_output_control(mt9p031, -+ MT9P031_OUTPUT_CONTROL_CEN, 0); -+ if (ret < 0) -+ return ret; -+ ret = mt9p031_pll_disable(client); -+ } -+ return ret; -+} -+ -+static int mt9p031_video_probe(struct i2c_client *client) -+{ -+ s32 data; -+ -+ /* Read out the chip version register */ -+ data = reg_read(client, MT9P031_CHIP_VERSION); -+ if (data != MT9P031_CHIP_VERSION_VALUE) { -+ dev_err(&client->dev, -+ "No MT9P031 chip detected, register read %x\n", data); -+ return -ENODEV; -+ } -+ -+ dev_info(&client->dev, "Detected a MT9P031 chip ID %x\n", data); -+ -+ return 0; -+} -+ -+static int mt9p031_set_power(struct v4l2_subdev *sd, int on) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ int ret = 0; -+ -+ mutex_lock(&mt9p031->power_lock); -+ -+ /* -+ * If the power count is modified from 0 to != 0 or from != 0 to 0, -+ * update the power state. -+ */ -+ if (mt9p031->power_count == !on) { -+ if (on) { -+ ret = mt9p031_power_on(mt9p031); -+ if (ret) { -+ dev_err(mt9p031->subdev.v4l2_dev->dev, -+ "Failed to power on: %d\n", ret); -+ goto out; -+ } -+ } else { -+ mt9p031_power_off(mt9p031); -+ } -+ } -+ -+ /* Update the power count. */ -+ mt9p031->power_count += on ? 1 : -1; -+ WARN_ON(mt9p031->power_count < 0); -+ -+out: -+ mutex_unlock(&mt9p031->power_lock); -+ return ret; -+} -+ -+static int mt9p031_registered(struct v4l2_subdev *sd) -+{ -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9p031->subdev); -+ int ret; -+ -+ ret = mt9p031_set_power(&mt9p031->subdev, 1); -+ if (ret) { -+ dev_err(&client->dev, -+ "Failed to power on device: %d\n", ret); -+ return ret; -+ } -+ -+ ret = mt9p031_video_probe(client); -+ -+ mt9p031_set_power(&mt9p031->subdev, 0); -+ -+ return ret; -+} -+ -+static int mt9p031_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) -+{ -+ struct mt9p031 *mt9p031; -+ mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ mt9p031->rect.width = MT9P031_WINDOW_WIDTH_DEF; -+ mt9p031->rect.height = MT9P031_WINDOW_HEIGHT_DEF; -+ mt9p031->rect.left = MT9P031_COLUMN_START_DEF; -+ mt9p031->rect.top = MT9P031_ROW_START_DEF; -+ -+ if (mt9p031->pdata->version == MT9P031_MONOCHROME_VERSION) -+ mt9p031->format.code = V4L2_MBUS_FMT_Y12_1X12; -+ else -+ mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12; -+ -+ mt9p031->format.width = MT9P031_WINDOW_WIDTH_DEF; -+ mt9p031->format.height = MT9P031_WINDOW_HEIGHT_DEF; -+ mt9p031->format.field = V4L2_FIELD_NONE; -+ mt9p031->format.colorspace = V4L2_COLORSPACE_SRGB; -+ -+ mt9p031->xskip = 1; -+ mt9p031->yskip = 1; -+ return mt9p031_set_power(sd, 1); -+} -+ -+static int mt9p031_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) -+{ -+ return mt9p031_set_power(sd, 0); -+} -+ -+static struct v4l2_subdev_core_ops mt9p031_subdev_core_ops = { -+ .s_power = mt9p031_set_power, -+}; -+ -+static struct v4l2_subdev_video_ops mt9p031_subdev_video_ops = { -+ .s_stream = mt9p031_s_stream, -+}; -+ -+static struct v4l2_subdev_pad_ops mt9p031_subdev_pad_ops = { -+ .enum_mbus_code = mt9p031_enum_mbus_code, -+ .get_fmt = mt9p031_get_format, -+ .set_fmt = mt9p031_set_format, -+ .get_crop = mt9p031_get_crop, -+ .set_crop = mt9p031_set_crop, -+}; -+ -+static struct v4l2_subdev_ops mt9p031_subdev_ops = { -+ .core = &mt9p031_subdev_core_ops, -+ .video = &mt9p031_subdev_video_ops, -+ .pad = &mt9p031_subdev_pad_ops, -+}; -+ -+static const struct v4l2_subdev_internal_ops mt9p031_subdev_internal_ops = { -+ .registered = mt9p031_registered, -+ .open = mt9p031_open, -+ .close = mt9p031_close, -+}; -+ -+static int mt9p031_probe(struct i2c_client *client, -+ const struct i2c_device_id *did) -+{ -+ int ret; -+ struct mt9p031 *mt9p031; -+ struct mt9p031_platform_data *pdata = client->dev.platform_data; -+ struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); -+ -+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WORD_DATA)) { -+ dev_warn(&adapter->dev, -+ "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n"); -+ return -EIO; -+ } -+ -+ mt9p031 = kzalloc(sizeof(struct mt9p031), GFP_KERNEL); -+ if (!mt9p031) -+ return -ENOMEM; -+ -+ mutex_init(&mt9p031->power_lock); -+ v4l2_i2c_subdev_init(&mt9p031->subdev, client, &mt9p031_subdev_ops); -+ mt9p031->subdev.internal_ops = &mt9p031_subdev_internal_ops; -+ -+ mt9p031->pdata = pdata; -+ -+ mt9p031->pad.flags = MEDIA_PAD_FL_SOURCE; -+ ret = media_entity_init(&mt9p031->subdev.entity, 1, &mt9p031->pad, 0); -+ if (ret) -+ return ret; -+ -+ mt9p031->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; -+ -+ return 0; -+} -+ -+static int mt9p031_remove(struct i2c_client *client) -+{ -+ struct v4l2_subdev *sd = i2c_get_clientdata(client); -+ struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev); -+ -+ v4l2_device_unregister_subdev(sd); -+ media_entity_cleanup(&sd->entity); -+ kfree(mt9p031); -+ -+ return 0; -+} -+ -+static const struct i2c_device_id mt9p031_id[] = { -+ { "mt9p031", 0 }, -+ { } -+}; -+MODULE_DEVICE_TABLE(i2c, mt9p031_id); -+ -+static struct i2c_driver mt9p031_i2c_driver = { -+ .driver = { -+ .name = "mt9p031", -+ }, -+ .probe = mt9p031_probe, -+ .remove = mt9p031_remove, -+ .id_table = mt9p031_id, -+}; -+ -+static int __init mt9p031_mod_init(void) -+{ -+ return i2c_add_driver(&mt9p031_i2c_driver); -+} -+ -+static void __exit mt9p031_mod_exit(void) -+{ -+ i2c_del_driver(&mt9p031_i2c_driver); -+} -+ -+module_init(mt9p031_mod_init); -+module_exit(mt9p031_mod_exit); -+ -+MODULE_DESCRIPTION("Aptina MT9P031 Camera driver"); -+MODULE_AUTHOR("Bastian Hecht "); -+MODULE_LICENSE("GPL v2"); -diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h -new file mode 100644 -index 0000000..27b4c75 ---- /dev/null -+++ b/include/media/mt9p031.h -@@ -0,0 +1,23 @@ -+#ifndef MT9P031_H -+#define MT9P031_H -+ -+struct v4l2_subdev; -+ -+enum { -+ MT9P031_COLOR_VERSION = 0, -+ MT9P031_MONOCHROME_VERSION = 1, -+}; -+ -+enum { -+ MT9P031_VDD_IO_1V8 = 0, -+ MT9P031_VDD_IO_2V8 = 1, -+}; -+ -+struct mt9p031_platform_data { -+ int (*set_xclk)(struct v4l2_subdev *subdev, int hz); -+ int (*reset)(struct v4l2_subdev *subdev, int active); -+ int vdd_io; /* MT9P031_VDD_IO_1V8 or MT9P031_VDD_IO_2V8 */ -+ int version; /* MT9P031_COLOR_VERSION or MT9P031_MONOCHROME_VERSION */ -+}; -+ -+#endif --- -1.7.0.4 - --- -You received this message because you are subscribed to the Google Groups "Beagle Board" group. -To post to this group, send email to beagleboard@googlegroups.com. -To unsubscribe from this group, send email to beagleboard+unsubscribe@googlegroups.com. -For more options, visit this group at http://groups.google.com/group/beagleboard?hl=en. - diff --git a/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-v4l-Add-mt9v032-sensor-driver.patch b/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-v4l-Add-mt9v032-sensor-driver.patch deleted file mode 100644 index 6972eb87..00000000 --- a/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-v4l-Add-mt9v032-sensor-driver.patch +++ /dev/null @@ -1,853 +0,0 @@ -From 45b4d28d17536c1ee328706cf5d2a123f8e567f5 Mon Sep 17 00:00:00 2001 -From: Detlev Casanova -Date: Sun, 28 Nov 2010 19:07:20 +0100 -Subject: [PATCH 01/35] v4l: Add mt9v032 sensor driver - -The MT9V032 is a parallel wide VGA sensor from Aptina (formerly Micron) -controlled through I2C. - -The driver creates a V4L2 subdevice. It currently supports binning and -cropping, and the gain, auto gain, exposure, auto exposure and test -pattern controls. - -Signed-off-by: Detlev Casanova -Signed-off-by: Laurent Pinchart ---- - drivers/media/video/Kconfig | 7 + - drivers/media/video/Makefile | 1 + - drivers/media/video/mt9v032.c | 773 +++++++++++++++++++++++++++++++++++++++++ - include/media/mt9v032.h | 12 + - 4 files changed, 793 insertions(+), 0 deletions(-) - create mode 100644 drivers/media/video/mt9v032.c - create mode 100644 include/media/mt9v032.h - -diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig -index cb87e35..3a5bc57 100644 ---- a/drivers/media/video/Kconfig -+++ b/drivers/media/video/Kconfig -@@ -344,6 +344,13 @@ config VIDEO_MT9V011 - mt0v011 1.3 Mpixel camera. It currently only works with the - em28xx driver. - -+config VIDEO_MT9V032 -+ tristate "Micron MT9V032 sensor support" -+ depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API -+ ---help--- -+ This is a Video4Linux2 sensor-level driver for the Micron -+ MT9V032 752x480 CMOS sensor. -+ - config VIDEO_TCM825X - tristate "TCM825x camera sensor support" - depends on I2C && VIDEO_V4L2 -diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile -index 912b29b..6679c6a 100644 ---- a/drivers/media/video/Makefile -+++ b/drivers/media/video/Makefile -@@ -67,6 +67,7 @@ obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o - obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o - obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o - obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o -+obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o - obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o - obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o - -diff --git a/drivers/media/video/mt9v032.c b/drivers/media/video/mt9v032.c -new file mode 100644 -index 0000000..c64e1dc ---- /dev/null -+++ b/drivers/media/video/mt9v032.c -@@ -0,0 +1,773 @@ -+/* -+ * Driver for MT9V032 CMOS Image Sensor from Micron -+ * -+ * Copyright (C) 2010, Laurent Pinchart -+ * -+ * Based on the MT9M001 driver, -+ * -+ * Copyright (C) 2008, Guennadi Liakhovetski -+ * -+ * 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 -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#define MT9V032_PIXEL_ARRAY_HEIGHT 492 -+#define MT9V032_PIXEL_ARRAY_WIDTH 782 -+ -+#define MT9V032_CHIP_VERSION 0x00 -+#define MT9V032_CHIP_ID_REV1 0x1311 -+#define MT9V032_CHIP_ID_REV3 0x1313 -+#define MT9V032_COLUMN_START 0x01 -+#define MT9V032_COLUMN_START_MIN 1 -+#define MT9V032_COLUMN_START_DEF 1 -+#define MT9V032_COLUMN_START_MAX 752 -+#define MT9V032_ROW_START 0x02 -+#define MT9V032_ROW_START_MIN 4 -+#define MT9V032_ROW_START_DEF 5 -+#define MT9V032_ROW_START_MAX 482 -+#define MT9V032_WINDOW_HEIGHT 0x03 -+#define MT9V032_WINDOW_HEIGHT_MIN 1 -+#define MT9V032_WINDOW_HEIGHT_DEF 480 -+#define MT9V032_WINDOW_HEIGHT_MAX 480 -+#define MT9V032_WINDOW_WIDTH 0x04 -+#define MT9V032_WINDOW_WIDTH_MIN 1 -+#define MT9V032_WINDOW_WIDTH_DEF 752 -+#define MT9V032_WINDOW_WIDTH_MAX 752 -+#define MT9V032_HORIZONTAL_BLANKING 0x05 -+#define MT9V032_HORIZONTAL_BLANKING_MIN 43 -+#define MT9V032_HORIZONTAL_BLANKING_MAX 1023 -+#define MT9V032_VERTICAL_BLANKING 0x06 -+#define MT9V032_VERTICAL_BLANKING_MIN 4 -+#define MT9V032_VERTICAL_BLANKING_MAX 3000 -+#define MT9V032_CHIP_CONTROL 0x07 -+#define MT9V032_CHIP_CONTROL_MASTER_MODE (1 << 3) -+#define MT9V032_CHIP_CONTROL_DOUT_ENABLE (1 << 7) -+#define MT9V032_CHIP_CONTROL_SEQUENTIAL (1 << 8) -+#define MT9V032_SHUTTER_WIDTH1 0x08 -+#define MT9V032_SHUTTER_WIDTH2 0x09 -+#define MT9V032_SHUTTER_WIDTH_CONTROL 0x0a -+#define MT9V032_TOTAL_SHUTTER_WIDTH 0x0b -+#define MT9V032_TOTAL_SHUTTER_WIDTH_MIN 1 -+#define MT9V032_TOTAL_SHUTTER_WIDTH_DEF 480 -+#define MT9V032_TOTAL_SHUTTER_WIDTH_MAX 32767 -+#define MT9V032_RESET 0x0c -+#define MT9V032_READ_MODE 0x0d -+#define MT9V032_READ_MODE_ROW_BIN_MASK (3 << 0) -+#define MT9V032_READ_MODE_ROW_BIN_SHIFT 0 -+#define MT9V032_READ_MODE_COLUMN_BIN_MASK (3 << 2) -+#define MT9V032_READ_MODE_COLUMN_BIN_SHIFT 2 -+#define MT9V032_READ_MODE_ROW_FLIP (1 << 4) -+#define MT9V032_READ_MODE_COLUMN_FLIP (1 << 5) -+#define MT9V032_READ_MODE_DARK_COLUMNS (1 << 6) -+#define MT9V032_READ_MODE_DARK_ROWS (1 << 7) -+#define MT9V032_PIXEL_OPERATION_MODE 0x0f -+#define MT9V032_PIXEL_OPERATION_MODE_COLOR (1 << 2) -+#define MT9V032_PIXEL_OPERATION_MODE_HDR (1 << 6) -+#define MT9V032_ANALOG_GAIN 0x35 -+#define MT9V032_ANALOG_GAIN_MIN 16 -+#define MT9V032_ANALOG_GAIN_DEF 16 -+#define MT9V032_ANALOG_GAIN_MAX 64 -+#define MT9V032_MAX_ANALOG_GAIN 0x36 -+#define MT9V032_MAX_ANALOG_GAIN_MAX 127 -+#define MT9V032_FRAME_DARK_AVERAGE 0x42 -+#define MT9V032_DARK_AVG_THRESH 0x46 -+#define MT9V032_DARK_AVG_LOW_THRESH_MASK (255 << 0) -+#define MT9V032_DARK_AVG_LOW_THRESH_SHIFT 0 -+#define MT9V032_DARK_AVG_HIGH_THRESH_MASK (255 << 8) -+#define MT9V032_DARK_AVG_HIGH_THRESH_SHIFT 8 -+#define MT9V032_ROW_NOISE_CORR_CONTROL 0x70 -+#define MT9V032_ROW_NOISE_CORR_ENABLE (1 << 5) -+#define MT9V032_ROW_NOISE_CORR_USE_BLK_AVG (1 << 7) -+#define MT9V032_PIXEL_CLOCK 0x74 -+#define MT9V032_PIXEL_CLOCK_INV_LINE (1 << 0) -+#define MT9V032_PIXEL_CLOCK_INV_FRAME (1 << 1) -+#define MT9V032_PIXEL_CLOCK_XOR_LINE (1 << 2) -+#define MT9V032_PIXEL_CLOCK_CONT_LINE (1 << 3) -+#define MT9V032_PIXEL_CLOCK_INV_PXL_CLK (1 << 4) -+#define MT9V032_TEST_PATTERN 0x7f -+#define MT9V032_TEST_PATTERN_DATA_MASK (1023 << 0) -+#define MT9V032_TEST_PATTERN_DATA_SHIFT 0 -+#define MT9V032_TEST_PATTERN_USE_DATA (1 << 10) -+#define MT9V032_TEST_PATTERN_GRAY_MASK (3 << 11) -+#define MT9V032_TEST_PATTERN_GRAY_NONE (0 << 11) -+#define MT9V032_TEST_PATTERN_GRAY_VERTICAL (1 << 11) -+#define MT9V032_TEST_PATTERN_GRAY_HORIZONTAL (2 << 11) -+#define MT9V032_TEST_PATTERN_GRAY_DIAGONAL (3 << 11) -+#define MT9V032_TEST_PATTERN_ENABLE (1 << 13) -+#define MT9V032_TEST_PATTERN_FLIP (1 << 14) -+#define MT9V032_AEC_AGC_ENABLE 0xaf -+#define MT9V032_AEC_ENABLE (1 << 0) -+#define MT9V032_AGC_ENABLE (1 << 1) -+#define MT9V032_THERMAL_INFO 0xc1 -+ -+struct mt9v032 { -+ struct v4l2_subdev subdev; -+ struct media_pad pad; -+ -+ struct v4l2_mbus_framefmt format; -+ struct v4l2_rect crop; -+ -+ struct v4l2_ctrl_handler ctrls; -+ -+ struct mutex power_lock; -+ int power_count; -+ -+ struct mt9v032_platform_data *pdata; -+ u16 chip_control; -+ u16 aec_agc; -+}; -+ -+static struct mt9v032 *to_mt9v032(struct v4l2_subdev *sd) -+{ -+ return container_of(sd, struct mt9v032, subdev); -+} -+ -+static int mt9v032_read(struct i2c_client *client, const u8 reg) -+{ -+ s32 data = i2c_smbus_read_word_data(client, reg); -+ dev_dbg(&client->dev, "%s: read 0x%04x from 0x%02x\n", __func__, -+ swab16(data), reg); -+ return data < 0 ? data : swab16(data); -+} -+ -+static int mt9v032_write(struct i2c_client *client, const u8 reg, -+ const u16 data) -+{ -+ dev_dbg(&client->dev, "%s: writing 0x%04x to 0x%02x\n", __func__, -+ data, reg); -+ return i2c_smbus_write_word_data(client, reg, swab16(data)); -+} -+ -+static int mt9v032_set_chip_control(struct mt9v032 *mt9v032, u16 clear, u16 set) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); -+ u16 value = (mt9v032->chip_control & ~clear) | set; -+ int ret; -+ -+ ret = mt9v032_write(client, MT9V032_CHIP_CONTROL, value); -+ if (ret < 0) -+ return ret; -+ -+ mt9v032->chip_control = value; -+ return 0; -+} -+ -+static int -+mt9v032_update_aec_agc(struct mt9v032 *mt9v032, u16 which, int enable) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); -+ u16 value = mt9v032->aec_agc; -+ int ret; -+ -+ if (enable) -+ value |= which; -+ else -+ value &= ~which; -+ -+ ret = mt9v032_write(client, MT9V032_AEC_AGC_ENABLE, value); -+ if (ret < 0) -+ return ret; -+ -+ mt9v032->aec_agc = value; -+ return 0; -+} -+ -+static int mt9v032_power_on(struct mt9v032 *mt9v032) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); -+ int ret; -+ -+ if (mt9v032->pdata->set_clock) { -+ mt9v032->pdata->set_clock(&mt9v032->subdev, 25000000); -+ udelay(1); -+ } -+ -+ /* Reset the chip and stop data read out */ -+ ret = mt9v032_write(client, MT9V032_RESET, 1); -+ if (ret < 0) -+ return ret; -+ -+ ret = mt9v032_write(client, MT9V032_RESET, 0); -+ if (ret < 0) -+ return ret; -+ -+ return mt9v032_write(client, MT9V032_CHIP_CONTROL, 0); -+} -+ -+static void mt9v032_power_off(struct mt9v032 *mt9v032) -+{ -+ if (mt9v032->pdata->set_clock) -+ mt9v032->pdata->set_clock(&mt9v032->subdev, 0); -+} -+ -+static int __mt9v032_set_power(struct mt9v032 *mt9v032, bool on) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); -+ int ret; -+ -+ if (!on) { -+ mt9v032_power_off(mt9v032); -+ return 0; -+ } -+ -+ ret = mt9v032_power_on(mt9v032); -+ if (ret < 0) -+ return ret; -+ -+ /* Configure the pixel clock polarity */ -+ if (mt9v032->pdata && mt9v032->pdata->clk_pol) { -+ ret = mt9v032_write(client, MT9V032_PIXEL_CLOCK, -+ MT9V032_PIXEL_CLOCK_INV_PXL_CLK); -+ if (ret < 0) -+ return ret; -+ } -+ -+ /* Disable the noise correction algorithm and restore the controls. */ -+ ret = mt9v032_write(client, MT9V032_ROW_NOISE_CORR_CONTROL, 0); -+ if (ret < 0) -+ return ret; -+ -+ return v4l2_ctrl_handler_setup(&mt9v032->ctrls); -+} -+ -+/* ----------------------------------------------------------------------------- -+ * V4L2 subdev video operations -+ */ -+ -+static struct v4l2_mbus_framefmt * -+__mt9v032_get_pad_format(struct mt9v032 *mt9v032, 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 &mt9v032->format; -+ default: -+ return NULL; -+ } -+} -+ -+static struct v4l2_rect * -+__mt9v032_get_pad_crop(struct mt9v032 *mt9v032, 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_crop(fh, pad); -+ case V4L2_SUBDEV_FORMAT_ACTIVE: -+ return &mt9v032->crop; -+ default: -+ return NULL; -+ } -+} -+ -+static int mt9v032_s_stream(struct v4l2_subdev *subdev, int enable) -+{ -+ const u16 mode = MT9V032_CHIP_CONTROL_MASTER_MODE -+ | MT9V032_CHIP_CONTROL_DOUT_ENABLE -+ | MT9V032_CHIP_CONTROL_SEQUENTIAL; -+ struct i2c_client *client = v4l2_get_subdevdata(subdev); -+ struct mt9v032 *mt9v032 = to_mt9v032(subdev); -+ struct v4l2_mbus_framefmt *format = &mt9v032->format; -+ struct v4l2_rect *crop = &mt9v032->crop; -+ unsigned int hratio; -+ unsigned int vratio; -+ int ret; -+ -+ if (!enable) -+ return mt9v032_set_chip_control(mt9v032, mode, 0); -+ -+ /* Configure the window size and row/column bin */ -+ hratio = DIV_ROUND_CLOSEST(crop->width, format->width); -+ vratio = DIV_ROUND_CLOSEST(crop->height, format->height); -+ -+ ret = mt9v032_write(client, MT9V032_READ_MODE, -+ (hratio - 1) << MT9V032_READ_MODE_ROW_BIN_SHIFT | -+ (vratio - 1) << MT9V032_READ_MODE_COLUMN_BIN_SHIFT); -+ if (ret < 0) -+ return ret; -+ -+ ret = mt9v032_write(client, MT9V032_COLUMN_START, crop->left); -+ if (ret < 0) -+ return ret; -+ -+ ret = mt9v032_write(client, MT9V032_ROW_START, crop->top); -+ if (ret < 0) -+ return ret; -+ -+ ret = mt9v032_write(client, MT9V032_WINDOW_WIDTH, crop->width); -+ if (ret < 0) -+ return ret; -+ -+ ret = mt9v032_write(client, MT9V032_WINDOW_HEIGHT, crop->height); -+ if (ret < 0) -+ return ret; -+ -+ ret = mt9v032_write(client, MT9V032_HORIZONTAL_BLANKING, -+ max(43, 660 - crop->width)); -+ if (ret < 0) -+ return ret; -+ -+ /* Switch to master "normal" mode */ -+ return mt9v032_set_chip_control(mt9v032, 0, mode); -+} -+ -+static int mt9v032_enum_mbus_code(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 mt9v032_enum_frame_size(struct v4l2_subdev *subdev, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_frame_size_enum *fse) -+{ -+ if (fse->index >= 8 || fse->code != V4L2_MBUS_FMT_SGRBG10_1X10) -+ return -EINVAL; -+ -+ fse->min_width = MT9V032_WINDOW_WIDTH_DEF / fse->index; -+ fse->max_width = fse->min_width; -+ fse->min_height = MT9V032_WINDOW_HEIGHT_DEF / fse->index; -+ fse->max_height = fse->min_height; -+ -+ return 0; -+} -+ -+static int mt9v032_get_format(struct v4l2_subdev *subdev, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_format *format) -+{ -+ struct mt9v032 *mt9v032 = to_mt9v032(subdev); -+ -+ format->format = *__mt9v032_get_pad_format(mt9v032, fh, format->pad, -+ format->which); -+ return 0; -+} -+ -+static int mt9v032_set_format(struct v4l2_subdev *subdev, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_format *format) -+{ -+ struct mt9v032 *mt9v032 = to_mt9v032(subdev); -+ struct v4l2_mbus_framefmt *__format; -+ struct v4l2_rect *__crop; -+ unsigned int width; -+ unsigned int height; -+ unsigned int hratio; -+ unsigned int vratio; -+ -+ __crop = __mt9v032_get_pad_crop(mt9v032, fh, format->pad, -+ format->which); -+ -+ /* Clamp the width and height to avoid dividing by zero. */ -+ width = clamp_t(unsigned int, ALIGN(format->format.width, 2), -+ max(__crop->width / 8, MT9V032_WINDOW_WIDTH_MIN), -+ __crop->width); -+ height = clamp_t(unsigned int, ALIGN(format->format.height, 2), -+ max(__crop->height / 8, MT9V032_WINDOW_HEIGHT_MIN), -+ __crop->height); -+ -+ hratio = DIV_ROUND_CLOSEST(__crop->width, width); -+ vratio = DIV_ROUND_CLOSEST(__crop->height, height); -+ -+ __format = __mt9v032_get_pad_format(mt9v032, fh, format->pad, -+ format->which); -+ __format->width = __crop->width / hratio; -+ __format->height = __crop->height / vratio; -+ -+ format->format = *__format; -+ -+ return 0; -+} -+ -+static int mt9v032_get_crop(struct v4l2_subdev *subdev, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_crop *crop) -+{ -+ struct mt9v032 *mt9v032 = to_mt9v032(subdev); -+ -+ crop->rect = *__mt9v032_get_pad_crop(mt9v032, fh, crop->pad, -+ crop->which); -+ return 0; -+} -+ -+static int mt9v032_set_crop(struct v4l2_subdev *subdev, -+ struct v4l2_subdev_fh *fh, -+ struct v4l2_subdev_crop *crop) -+{ -+ struct mt9v032 *mt9v032 = to_mt9v032(subdev); -+ struct v4l2_mbus_framefmt *__format; -+ struct v4l2_rect *__crop; -+ struct v4l2_rect rect; -+ -+ /* Clamp the crop rectangle boundaries and align them to a non multiple -+ * of 2 pixels to ensure a GRBG Bayer pattern. -+ */ -+ rect.left = clamp(ALIGN(crop->rect.left + 1, 2) - 1, -+ MT9V032_COLUMN_START_MIN, -+ MT9V032_COLUMN_START_MAX); -+ rect.top = clamp(ALIGN(crop->rect.top + 1, 2) - 1, -+ MT9V032_ROW_START_MIN, -+ MT9V032_ROW_START_MAX); -+ rect.width = clamp(ALIGN(crop->rect.width, 2), -+ MT9V032_WINDOW_WIDTH_MIN, -+ MT9V032_WINDOW_WIDTH_MAX); -+ rect.height = clamp(ALIGN(crop->rect.height, 2), -+ MT9V032_WINDOW_HEIGHT_MIN, -+ MT9V032_WINDOW_HEIGHT_MAX); -+ -+ rect.width = min(rect.width, MT9V032_PIXEL_ARRAY_WIDTH - rect.left); -+ rect.height = min(rect.height, MT9V032_PIXEL_ARRAY_HEIGHT - rect.top); -+ -+ __crop = __mt9v032_get_pad_crop(mt9v032, fh, crop->pad, crop->which); -+ -+ if (rect.width != __crop->width || rect.height != __crop->height) { -+ /* Reset the output image size if the crop rectangle size has -+ * been modified. -+ */ -+ __format = __mt9v032_get_pad_format(mt9v032, fh, crop->pad, -+ crop->which); -+ __format->width = rect.width; -+ __format->height = rect.height; -+ } -+ -+ *__crop = rect; -+ crop->rect = rect; -+ -+ return 0; -+} -+ -+/* ----------------------------------------------------------------------------- -+ * V4L2 subdev control operations -+ */ -+ -+#define V4L2_CID_TEST_PATTERN (V4L2_CID_USER_BASE | 0x1001) -+ -+static int mt9v032_s_ctrl(struct v4l2_ctrl *ctrl) -+{ -+ struct mt9v032 *mt9v032 = -+ container_of(ctrl->handler, struct mt9v032, ctrls); -+ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); -+ u16 data; -+ -+ switch (ctrl->id) { -+ case V4L2_CID_AUTOGAIN: -+ return mt9v032_update_aec_agc(mt9v032, MT9V032_AGC_ENABLE, -+ ctrl->val); -+ -+ case V4L2_CID_GAIN: -+ return mt9v032_write(client, MT9V032_ANALOG_GAIN, ctrl->val); -+ -+ case V4L2_CID_EXPOSURE_AUTO: -+ return mt9v032_update_aec_agc(mt9v032, MT9V032_AEC_ENABLE, -+ ctrl->val); -+ -+ case V4L2_CID_EXPOSURE: -+ return mt9v032_write(client, MT9V032_TOTAL_SHUTTER_WIDTH, -+ ctrl->val); -+ -+ case V4L2_CID_TEST_PATTERN: -+ switch (ctrl->val) { -+ case 0: -+ data = 0; -+ break; -+ case 1: -+ data = MT9V032_TEST_PATTERN_GRAY_VERTICAL -+ | MT9V032_TEST_PATTERN_ENABLE; -+ break; -+ case 2: -+ data = MT9V032_TEST_PATTERN_GRAY_HORIZONTAL -+ | MT9V032_TEST_PATTERN_ENABLE; -+ break; -+ case 3: -+ data = MT9V032_TEST_PATTERN_GRAY_DIAGONAL -+ | MT9V032_TEST_PATTERN_ENABLE; -+ break; -+ default: -+ data = (ctrl->val << MT9V032_TEST_PATTERN_DATA_SHIFT) -+ | MT9V032_TEST_PATTERN_USE_DATA -+ | MT9V032_TEST_PATTERN_ENABLE -+ | MT9V032_TEST_PATTERN_FLIP; -+ break; -+ } -+ -+ return mt9v032_write(client, MT9V032_TEST_PATTERN, data); -+ } -+ -+ return 0; -+} -+ -+static struct v4l2_ctrl_ops mt9v032_ctrl_ops = { -+ .s_ctrl = mt9v032_s_ctrl, -+}; -+ -+static const struct v4l2_ctrl_config mt9v032_ctrls[] = { -+ { -+ .ops = &mt9v032_ctrl_ops, -+ .id = V4L2_CID_TEST_PATTERN, -+ .type = V4L2_CTRL_TYPE_INTEGER, -+ .name = "Test pattern", -+ .min = 0, -+ .max = 1023, -+ .step = 1, -+ .def = 0, -+ .flags = 0, -+ } -+}; -+ -+/* ----------------------------------------------------------------------------- -+ * V4L2 subdev core operations -+ */ -+ -+static int mt9v032_set_power(struct v4l2_subdev *subdev, int on) -+{ -+ struct mt9v032 *mt9v032 = to_mt9v032(subdev); -+ int ret = 0; -+ -+ mutex_lock(&mt9v032->power_lock); -+ -+ /* If the power count is modified from 0 to != 0 or from != 0 to 0, -+ * update the power state. -+ */ -+ if (mt9v032->power_count == !on) { -+ ret = __mt9v032_set_power(mt9v032, !!on); -+ if (ret < 0) -+ goto done; -+ } -+ -+ /* Update the power count. */ -+ mt9v032->power_count += on ? 1 : -1; -+ WARN_ON(mt9v032->power_count < 0); -+ -+done: -+ mutex_unlock(&mt9v032->power_lock); -+ return ret; -+} -+ -+/* ----------------------------------------------------------------------------- -+ * V4L2 subdev internal operations -+ */ -+ -+static int mt9v032_registered(struct v4l2_subdev *subdev) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(subdev); -+ struct mt9v032 *mt9v032 = to_mt9v032(subdev); -+ s32 data; -+ int ret; -+ -+ dev_info(&client->dev, "Probing MT9V032 at address 0x%02x\n", -+ client->addr); -+ -+ ret = mt9v032_power_on(mt9v032); -+ if (ret < 0) { -+ dev_err(&client->dev, "MT9V032 power up failed\n"); -+ return ret; -+ } -+ -+ /* Read and check the sensor version */ -+ data = mt9v032_read(client, MT9V032_CHIP_VERSION); -+ if (data != MT9V032_CHIP_ID_REV1 && data != MT9V032_CHIP_ID_REV3) { -+ dev_err(&client->dev, "MT9V032 not detected, wrong version " -+ "0x%04x\n", data); -+ return -ENODEV; -+ } -+ -+ mt9v032_power_off(mt9v032); -+ -+ dev_info(&client->dev, "MT9V032 detected at address 0x%02x\n", -+ client->addr); -+ -+ return ret; -+} -+ -+static int mt9v032_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) -+{ -+ struct v4l2_mbus_framefmt *format; -+ struct v4l2_rect *crop; -+ -+ crop = v4l2_subdev_get_try_crop(fh, 0); -+ crop->left = MT9V032_COLUMN_START_DEF; -+ crop->top = MT9V032_ROW_START_DEF; -+ crop->width = MT9V032_WINDOW_WIDTH_DEF; -+ crop->height = MT9V032_WINDOW_HEIGHT_DEF; -+ -+ format = v4l2_subdev_get_try_format(fh, 0); -+ format->code = V4L2_MBUS_FMT_SGRBG10_1X10; -+ format->width = MT9V032_WINDOW_WIDTH_DEF; -+ format->height = MT9V032_WINDOW_HEIGHT_DEF; -+ format->field = V4L2_FIELD_NONE; -+ format->colorspace = V4L2_COLORSPACE_SRGB; -+ -+ return mt9v032_set_power(subdev, 1); -+} -+ -+static int mt9v032_close(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) -+{ -+ return mt9v032_set_power(subdev, 0); -+} -+ -+static struct v4l2_subdev_core_ops mt9v032_subdev_core_ops = { -+ .s_power = mt9v032_set_power, -+}; -+ -+static struct v4l2_subdev_video_ops mt9v032_subdev_video_ops = { -+ .s_stream = mt9v032_s_stream, -+}; -+ -+static struct v4l2_subdev_pad_ops mt9v032_subdev_pad_ops = { -+ .enum_mbus_code = mt9v032_enum_mbus_code, -+ .enum_frame_size = mt9v032_enum_frame_size, -+ .get_fmt = mt9v032_get_format, -+ .set_fmt = mt9v032_set_format, -+ .get_crop = mt9v032_get_crop, -+ .set_crop = mt9v032_set_crop, -+}; -+ -+static struct v4l2_subdev_ops mt9v032_subdev_ops = { -+ .core = &mt9v032_subdev_core_ops, -+ .video = &mt9v032_subdev_video_ops, -+ .pad = &mt9v032_subdev_pad_ops, -+}; -+ -+static const struct v4l2_subdev_internal_ops mt9v032_subdev_internal_ops = { -+ .registered = mt9v032_registered, -+ .open = mt9v032_open, -+ .close = mt9v032_close, -+}; -+ -+/* ----------------------------------------------------------------------------- -+ * Driver initialization and probing -+ */ -+ -+static int mt9v032_probe(struct i2c_client *client, -+ const struct i2c_device_id *did) -+{ -+ struct mt9v032 *mt9v032; -+ unsigned int i; -+ int ret; -+ -+ if (!i2c_check_functionality(client->adapter, -+ I2C_FUNC_SMBUS_WORD_DATA)) { -+ dev_warn(&client->adapter->dev, -+ "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n"); -+ return -EIO; -+ } -+ -+ mt9v032 = kzalloc(sizeof(*mt9v032), GFP_KERNEL); -+ if (!mt9v032) -+ return -ENOMEM; -+ -+ mutex_init(&mt9v032->power_lock); -+ mt9v032->pdata = client->dev.platform_data; -+ -+ v4l2_ctrl_handler_init(&mt9v032->ctrls, ARRAY_SIZE(mt9v032_ctrls) + 4); -+ -+ v4l2_ctrl_new_std(&mt9v032->ctrls, &mt9v032_ctrl_ops, -+ V4L2_CID_AUTOGAIN, 0, 1, 1, 1); -+ v4l2_ctrl_new_std(&mt9v032->ctrls, &mt9v032_ctrl_ops, -+ V4L2_CID_GAIN, MT9V032_ANALOG_GAIN_MIN, -+ MT9V032_ANALOG_GAIN_MAX, 1, MT9V032_ANALOG_GAIN_DEF); -+ v4l2_ctrl_new_std_menu(&mt9v032->ctrls, &mt9v032_ctrl_ops, -+ V4L2_CID_EXPOSURE_AUTO, V4L2_EXPOSURE_MANUAL, 0, -+ V4L2_EXPOSURE_AUTO); -+ v4l2_ctrl_new_std(&mt9v032->ctrls, &mt9v032_ctrl_ops, -+ V4L2_CID_EXPOSURE, MT9V032_TOTAL_SHUTTER_WIDTH_MIN, -+ MT9V032_TOTAL_SHUTTER_WIDTH_MAX, 1, -+ MT9V032_TOTAL_SHUTTER_WIDTH_DEF); -+ -+ for (i = 0; i < ARRAY_SIZE(mt9v032_ctrls); ++i) -+ v4l2_ctrl_new_custom(&mt9v032->ctrls, &mt9v032_ctrls[i], NULL); -+ -+ mt9v032->subdev.ctrl_handler = &mt9v032->ctrls; -+ -+ if (mt9v032->ctrls.error) -+ printk(KERN_INFO "%s: control initialization error %d\n", -+ __func__, mt9v032->ctrls.error); -+ -+ mt9v032->crop.left = MT9V032_COLUMN_START_DEF; -+ mt9v032->crop.top = MT9V032_ROW_START_DEF; -+ mt9v032->crop.width = MT9V032_WINDOW_WIDTH_DEF; -+ mt9v032->crop.height = MT9V032_WINDOW_HEIGHT_DEF; -+ -+ mt9v032->format.code = V4L2_MBUS_FMT_SGRBG10_1X10; -+ mt9v032->format.width = MT9V032_WINDOW_WIDTH_DEF; -+ mt9v032->format.height = MT9V032_WINDOW_HEIGHT_DEF; -+ mt9v032->format.field = V4L2_FIELD_NONE; -+ mt9v032->format.colorspace = V4L2_COLORSPACE_SRGB; -+ -+ mt9v032->aec_agc = MT9V032_AEC_ENABLE | MT9V032_AGC_ENABLE; -+ -+ v4l2_i2c_subdev_init(&mt9v032->subdev, client, &mt9v032_subdev_ops); -+ mt9v032->subdev.internal_ops = &mt9v032_subdev_internal_ops; -+ mt9v032->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; -+ -+ mt9v032->pad.flags = MEDIA_PAD_FL_SOURCE; -+ ret = media_entity_init(&mt9v032->subdev.entity, 1, &mt9v032->pad, 0); -+ if (ret < 0) -+ kfree(mt9v032); -+ -+ return ret; -+} -+ -+static int mt9v032_remove(struct i2c_client *client) -+{ -+ struct v4l2_subdev *subdev = i2c_get_clientdata(client); -+ struct mt9v032 *mt9v032 = to_mt9v032(subdev); -+ -+ v4l2_device_unregister_subdev(subdev); -+ media_entity_cleanup(&subdev->entity); -+ kfree(mt9v032); -+ return 0; -+} -+ -+static const struct i2c_device_id mt9v032_id[] = { -+ { "mt9v032", 0 }, -+ { } -+}; -+MODULE_DEVICE_TABLE(i2c, mt9v032_id); -+ -+static struct i2c_driver mt9v032_driver = { -+ .driver = { -+ .name = "mt9v032", -+ }, -+ .probe = mt9v032_probe, -+ .remove = mt9v032_remove, -+ .id_table = mt9v032_id, -+}; -+ -+static int __init mt9v032_init(void) -+{ -+ return i2c_add_driver(&mt9v032_driver); -+} -+ -+static void __exit mt9v032_exit(void) -+{ -+ i2c_del_driver(&mt9v032_driver); -+} -+ -+module_init(mt9v032_init); -+module_exit(mt9v032_exit); -+ -+MODULE_DESCRIPTION("Aptina MT9V032 Camera driver"); -+MODULE_AUTHOR("Laurent Pinchart "); -+MODULE_LICENSE("GPL"); -diff --git a/include/media/mt9v032.h b/include/media/mt9v032.h -new file mode 100644 -index 0000000..5e27f9b ---- /dev/null -+++ b/include/media/mt9v032.h -@@ -0,0 +1,12 @@ -+#ifndef _MEDIA_MT9V032_H -+#define _MEDIA_MT9V032_H -+ -+struct v4l2_subdev; -+ -+struct mt9v032_platform_data { -+ unsigned int clk_pol:1; -+ -+ void (*set_clock)(struct v4l2_subdev *subdev, unsigned int rate); -+}; -+ -+#endif --- -1.6.6.1 - diff --git a/recipes-kernel/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch b/recipes-kernel/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch deleted file mode 100644 index 5e06564e..00000000 --- a/recipes-kernel/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 846c5da448cdd12098df3b89fc97cfd9dd3e2f5b Mon Sep 17 00:00:00 2001 -From: Javier Martin -Date: Mon, 30 May 2011 10:37:17 +0200 -Subject: [PATCH] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM. - -Since isp clocks have not been exposed yet, this patch -includes a temporal solution for testing mt9p031 driver -in Beagleboard xM. - -Signed-off-by: Javier Martin ---- - arch/arm/mach-omap2/Makefile | 1 + - arch/arm/mach-omap2/board-omap3beagle-camera.c | 95 ++++++++++++++++++++++++ - arch/arm/mach-omap2/board-omap3beagle.c | 5 + - 3 files changed, 101 insertions(+), 0 deletions(-) - create mode 100644 arch/arm/mach-omap2/board-omap3beagle-camera.c - -diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile -index 512b152..05cd983 100644 ---- a/arch/arm/mach-omap2/Makefile -+++ b/arch/arm/mach-omap2/Makefile -@@ -179,6 +179,7 @@ obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \ - hsmmc.o - obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o - obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \ -+ board-omap3beagle-camera.o \ - hsmmc.o - obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o \ - hsmmc.o -diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c -new file mode 100644 -index 0000000..2632557 ---- /dev/null -+++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c -@@ -0,0 +1,95 @@ -+#include -+#include -+ -+#include -+ -+#include -+#include -+#include "devices.h" -+#include "../../../drivers/media/video/omap3isp/isp.h" -+ -+#define MT9P031_RESET_GPIO 98 -+#define MT9P031_XCLK ISP_XCLK_A -+ -+static struct regulator *reg_1v8, *reg_2v8; -+ -+static int beagle_cam_set_xclk(struct v4l2_subdev *subdev, int hz) -+{ -+ struct isp_device *isp = v4l2_dev_to_isp_device(subdev->v4l2_dev); -+ int ret; -+ -+ ret = isp->platform_cb.set_xclk(isp, hz, MT9P031_XCLK); -+ return 0; -+} -+ -+static int beagle_cam_reset(struct v4l2_subdev *subdev, int active) -+{ -+ /* Set RESET_BAR to !active */ -+ gpio_set_value(MT9P031_RESET_GPIO, !active); -+ -+ return 0; -+} -+ -+static struct mt9p031_platform_data beagle_mt9p031_platform_data = { -+ .set_xclk = beagle_cam_set_xclk, -+ .reset = beagle_cam_reset, -+ .vdd_io = MT9P031_VDD_IO_1V8, -+ .version = MT9P031_COLOR_VERSION, -+}; -+ -+static struct i2c_board_info mt9p031_camera_i2c_device = { -+ I2C_BOARD_INFO("mt9p031", 0x48), -+ .platform_data = &beagle_mt9p031_platform_data, -+}; -+ -+static struct isp_subdev_i2c_board_info mt9p031_camera_subdevs[] = { -+ { -+ .board_info = &mt9p031_camera_i2c_device, -+ .i2c_adapter_id = 2, -+ }, -+ { NULL, 0, }, -+}; -+ -+static struct isp_v4l2_subdevs_group beagle_camera_subdevs[] = { -+ { -+ .subdevs = mt9p031_camera_subdevs, -+ .interface = ISP_INTERFACE_PARALLEL, -+ .bus = { -+ .parallel = { -+ .data_lane_shift = 0, -+ .clk_pol = 1, -+ .bridge = ISPCTRL_PAR_BRIDGE_DISABLE, -+ } -+ }, -+ }, -+ { }, -+}; -+ -+static struct isp_platform_data beagle_isp_platform_data = { -+ .subdevs = beagle_camera_subdevs, -+}; -+ -+static int __init beagle_camera_init(void) -+{ -+ if (!machine_is_omap3_beagle() || !cpu_is_omap3630()) -+ return 0; -+ -+ reg_1v8 = regulator_get(NULL, "cam_1v8"); -+ if (IS_ERR(reg_1v8)) -+ pr_err("%s: cannot get cam_1v8 regulator\n", __func__); -+ else -+ regulator_enable(reg_1v8); -+ -+ reg_2v8 = regulator_get(NULL, "cam_2v8"); -+ if (IS_ERR(reg_2v8)) -+ pr_err("%s: cannot get cam_2v8 regulator\n", __func__); -+ else -+ regulator_enable(reg_2v8); -+ -+ omap_register_i2c_bus(2, 100, NULL, 0); -+ gpio_request(MT9P031_RESET_GPIO, "cam_rst"); -+ gpio_direction_output(MT9P031_RESET_GPIO, 0); -+ omap3_init_camera(&beagle_isp_platform_data); -+ return 0; -+} -+late_initcall(beagle_camera_init); -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 221bfda..dd6e31f 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -25,12 +25,16 @@ - #include - #include - #include -+#include -+#include -+#include - - #include - #include - #include - #include - -+#include - #include - #include - -@@ -48,6 +52,7 @@ - #include - #include - #include -+#include - - #include "mux.h" - #include "hsmmc.h" --- -1.6.6.1 - diff --git a/recipes-kernel/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch b/recipes-kernel/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch new file mode 100644 index 00000000..66353eaa --- /dev/null +++ b/recipes-kernel/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch @@ -0,0 +1,853 @@ +From 55d8ca4b03eb04432adefa6fbf6e5f0197c7fb32 Mon Sep 17 00:00:00 2001 +From: Detlev Casanova +Date: Sun, 28 Nov 2010 19:07:20 +0100 +Subject: [PATCH 2/3] v4l: Add mt9v032 sensor driver + +The MT9V032 is a parallel wide VGA sensor from Aptina (formerly Micron) +controlled through I2C. + +The driver creates a V4L2 subdevice. It currently supports binning and +cropping, and the gain, auto gain, exposure, auto exposure and test +pattern controls. + +Signed-off-by: Detlev Casanova +Signed-off-by: Laurent Pinchart +--- + drivers/media/video/Kconfig | 7 + + drivers/media/video/Makefile | 1 + + drivers/media/video/mt9v032.c | 773 +++++++++++++++++++++++++++++++++++++++++ + include/media/mt9v032.h | 12 + + 4 files changed, 793 insertions(+), 0 deletions(-) + create mode 100644 drivers/media/video/mt9v032.c + create mode 100644 include/media/mt9v032.h + +diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig +index cb87e35..3a5bc57 100644 +--- a/drivers/media/video/Kconfig ++++ b/drivers/media/video/Kconfig +@@ -344,6 +344,13 @@ config VIDEO_MT9V011 + mt0v011 1.3 Mpixel camera. It currently only works with the + em28xx driver. + ++config VIDEO_MT9V032 ++ tristate "Micron MT9V032 sensor support" ++ depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API ++ ---help--- ++ This is a Video4Linux2 sensor-level driver for the Micron ++ MT9V032 752x480 CMOS sensor. ++ + config VIDEO_TCM825X + tristate "TCM825x camera sensor support" + depends on I2C && VIDEO_V4L2 +diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile +index 912b29b..6679c6a 100644 +--- a/drivers/media/video/Makefile ++++ b/drivers/media/video/Makefile +@@ -67,6 +67,7 @@ obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o + obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o + obj-$(CONFIG_VIDEO_MT9P031) += mt9p031.o + obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o ++obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o + obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o + obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o + +diff --git a/drivers/media/video/mt9v032.c b/drivers/media/video/mt9v032.c +new file mode 100644 +index 0000000..c64e1dc +--- /dev/null ++++ b/drivers/media/video/mt9v032.c +@@ -0,0 +1,773 @@ ++/* ++ * Driver for MT9V032 CMOS Image Sensor from Micron ++ * ++ * Copyright (C) 2010, Laurent Pinchart ++ * ++ * Based on the MT9M001 driver, ++ * ++ * Copyright (C) 2008, Guennadi Liakhovetski ++ * ++ * 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 ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#define MT9V032_PIXEL_ARRAY_HEIGHT 492 ++#define MT9V032_PIXEL_ARRAY_WIDTH 782 ++ ++#define MT9V032_CHIP_VERSION 0x00 ++#define MT9V032_CHIP_ID_REV1 0x1311 ++#define MT9V032_CHIP_ID_REV3 0x1313 ++#define MT9V032_COLUMN_START 0x01 ++#define MT9V032_COLUMN_START_MIN 1 ++#define MT9V032_COLUMN_START_DEF 1 ++#define MT9V032_COLUMN_START_MAX 752 ++#define MT9V032_ROW_START 0x02 ++#define MT9V032_ROW_START_MIN 4 ++#define MT9V032_ROW_START_DEF 5 ++#define MT9V032_ROW_START_MAX 482 ++#define MT9V032_WINDOW_HEIGHT 0x03 ++#define MT9V032_WINDOW_HEIGHT_MIN 1 ++#define MT9V032_WINDOW_HEIGHT_DEF 480 ++#define MT9V032_WINDOW_HEIGHT_MAX 480 ++#define MT9V032_WINDOW_WIDTH 0x04 ++#define MT9V032_WINDOW_WIDTH_MIN 1 ++#define MT9V032_WINDOW_WIDTH_DEF 752 ++#define MT9V032_WINDOW_WIDTH_MAX 752 ++#define MT9V032_HORIZONTAL_BLANKING 0x05 ++#define MT9V032_HORIZONTAL_BLANKING_MIN 43 ++#define MT9V032_HORIZONTAL_BLANKING_MAX 1023 ++#define MT9V032_VERTICAL_BLANKING 0x06 ++#define MT9V032_VERTICAL_BLANKING_MIN 4 ++#define MT9V032_VERTICAL_BLANKING_MAX 3000 ++#define MT9V032_CHIP_CONTROL 0x07 ++#define MT9V032_CHIP_CONTROL_MASTER_MODE (1 << 3) ++#define MT9V032_CHIP_CONTROL_DOUT_ENABLE (1 << 7) ++#define MT9V032_CHIP_CONTROL_SEQUENTIAL (1 << 8) ++#define MT9V032_SHUTTER_WIDTH1 0x08 ++#define MT9V032_SHUTTER_WIDTH2 0x09 ++#define MT9V032_SHUTTER_WIDTH_CONTROL 0x0a ++#define MT9V032_TOTAL_SHUTTER_WIDTH 0x0b ++#define MT9V032_TOTAL_SHUTTER_WIDTH_MIN 1 ++#define MT9V032_TOTAL_SHUTTER_WIDTH_DEF 480 ++#define MT9V032_TOTAL_SHUTTER_WIDTH_MAX 32767 ++#define MT9V032_RESET 0x0c ++#define MT9V032_READ_MODE 0x0d ++#define MT9V032_READ_MODE_ROW_BIN_MASK (3 << 0) ++#define MT9V032_READ_MODE_ROW_BIN_SHIFT 0 ++#define MT9V032_READ_MODE_COLUMN_BIN_MASK (3 << 2) ++#define MT9V032_READ_MODE_COLUMN_BIN_SHIFT 2 ++#define MT9V032_READ_MODE_ROW_FLIP (1 << 4) ++#define MT9V032_READ_MODE_COLUMN_FLIP (1 << 5) ++#define MT9V032_READ_MODE_DARK_COLUMNS (1 << 6) ++#define MT9V032_READ_MODE_DARK_ROWS (1 << 7) ++#define MT9V032_PIXEL_OPERATION_MODE 0x0f ++#define MT9V032_PIXEL_OPERATION_MODE_COLOR (1 << 2) ++#define MT9V032_PIXEL_OPERATION_MODE_HDR (1 << 6) ++#define MT9V032_ANALOG_GAIN 0x35 ++#define MT9V032_ANALOG_GAIN_MIN 16 ++#define MT9V032_ANALOG_GAIN_DEF 16 ++#define MT9V032_ANALOG_GAIN_MAX 64 ++#define MT9V032_MAX_ANALOG_GAIN 0x36 ++#define MT9V032_MAX_ANALOG_GAIN_MAX 127 ++#define MT9V032_FRAME_DARK_AVERAGE 0x42 ++#define MT9V032_DARK_AVG_THRESH 0x46 ++#define MT9V032_DARK_AVG_LOW_THRESH_MASK (255 << 0) ++#define MT9V032_DARK_AVG_LOW_THRESH_SHIFT 0 ++#define MT9V032_DARK_AVG_HIGH_THRESH_MASK (255 << 8) ++#define MT9V032_DARK_AVG_HIGH_THRESH_SHIFT 8 ++#define MT9V032_ROW_NOISE_CORR_CONTROL 0x70 ++#define MT9V032_ROW_NOISE_CORR_ENABLE (1 << 5) ++#define MT9V032_ROW_NOISE_CORR_USE_BLK_AVG (1 << 7) ++#define MT9V032_PIXEL_CLOCK 0x74 ++#define MT9V032_PIXEL_CLOCK_INV_LINE (1 << 0) ++#define MT9V032_PIXEL_CLOCK_INV_FRAME (1 << 1) ++#define MT9V032_PIXEL_CLOCK_XOR_LINE (1 << 2) ++#define MT9V032_PIXEL_CLOCK_CONT_LINE (1 << 3) ++#define MT9V032_PIXEL_CLOCK_INV_PXL_CLK (1 << 4) ++#define MT9V032_TEST_PATTERN 0x7f ++#define MT9V032_TEST_PATTERN_DATA_MASK (1023 << 0) ++#define MT9V032_TEST_PATTERN_DATA_SHIFT 0 ++#define MT9V032_TEST_PATTERN_USE_DATA (1 << 10) ++#define MT9V032_TEST_PATTERN_GRAY_MASK (3 << 11) ++#define MT9V032_TEST_PATTERN_GRAY_NONE (0 << 11) ++#define MT9V032_TEST_PATTERN_GRAY_VERTICAL (1 << 11) ++#define MT9V032_TEST_PATTERN_GRAY_HORIZONTAL (2 << 11) ++#define MT9V032_TEST_PATTERN_GRAY_DIAGONAL (3 << 11) ++#define MT9V032_TEST_PATTERN_ENABLE (1 << 13) ++#define MT9V032_TEST_PATTERN_FLIP (1 << 14) ++#define MT9V032_AEC_AGC_ENABLE 0xaf ++#define MT9V032_AEC_ENABLE (1 << 0) ++#define MT9V032_AGC_ENABLE (1 << 1) ++#define MT9V032_THERMAL_INFO 0xc1 ++ ++struct mt9v032 { ++ struct v4l2_subdev subdev; ++ struct media_pad pad; ++ ++ struct v4l2_mbus_framefmt format; ++ struct v4l2_rect crop; ++ ++ struct v4l2_ctrl_handler ctrls; ++ ++ struct mutex power_lock; ++ int power_count; ++ ++ struct mt9v032_platform_data *pdata; ++ u16 chip_control; ++ u16 aec_agc; ++}; ++ ++static struct mt9v032 *to_mt9v032(struct v4l2_subdev *sd) ++{ ++ return container_of(sd, struct mt9v032, subdev); ++} ++ ++static int mt9v032_read(struct i2c_client *client, const u8 reg) ++{ ++ s32 data = i2c_smbus_read_word_data(client, reg); ++ dev_dbg(&client->dev, "%s: read 0x%04x from 0x%02x\n", __func__, ++ swab16(data), reg); ++ return data < 0 ? data : swab16(data); ++} ++ ++static int mt9v032_write(struct i2c_client *client, const u8 reg, ++ const u16 data) ++{ ++ dev_dbg(&client->dev, "%s: writing 0x%04x to 0x%02x\n", __func__, ++ data, reg); ++ return i2c_smbus_write_word_data(client, reg, swab16(data)); ++} ++ ++static int mt9v032_set_chip_control(struct mt9v032 *mt9v032, u16 clear, u16 set) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); ++ u16 value = (mt9v032->chip_control & ~clear) | set; ++ int ret; ++ ++ ret = mt9v032_write(client, MT9V032_CHIP_CONTROL, value); ++ if (ret < 0) ++ return ret; ++ ++ mt9v032->chip_control = value; ++ return 0; ++} ++ ++static int ++mt9v032_update_aec_agc(struct mt9v032 *mt9v032, u16 which, int enable) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); ++ u16 value = mt9v032->aec_agc; ++ int ret; ++ ++ if (enable) ++ value |= which; ++ else ++ value &= ~which; ++ ++ ret = mt9v032_write(client, MT9V032_AEC_AGC_ENABLE, value); ++ if (ret < 0) ++ return ret; ++ ++ mt9v032->aec_agc = value; ++ return 0; ++} ++ ++static int mt9v032_power_on(struct mt9v032 *mt9v032) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); ++ int ret; ++ ++ if (mt9v032->pdata->set_clock) { ++ mt9v032->pdata->set_clock(&mt9v032->subdev, 25000000); ++ udelay(1); ++ } ++ ++ /* Reset the chip and stop data read out */ ++ ret = mt9v032_write(client, MT9V032_RESET, 1); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_RESET, 0); ++ if (ret < 0) ++ return ret; ++ ++ return mt9v032_write(client, MT9V032_CHIP_CONTROL, 0); ++} ++ ++static void mt9v032_power_off(struct mt9v032 *mt9v032) ++{ ++ if (mt9v032->pdata->set_clock) ++ mt9v032->pdata->set_clock(&mt9v032->subdev, 0); ++} ++ ++static int __mt9v032_set_power(struct mt9v032 *mt9v032, bool on) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); ++ int ret; ++ ++ if (!on) { ++ mt9v032_power_off(mt9v032); ++ return 0; ++ } ++ ++ ret = mt9v032_power_on(mt9v032); ++ if (ret < 0) ++ return ret; ++ ++ /* Configure the pixel clock polarity */ ++ if (mt9v032->pdata && mt9v032->pdata->clk_pol) { ++ ret = mt9v032_write(client, MT9V032_PIXEL_CLOCK, ++ MT9V032_PIXEL_CLOCK_INV_PXL_CLK); ++ if (ret < 0) ++ return ret; ++ } ++ ++ /* Disable the noise correction algorithm and restore the controls. */ ++ ret = mt9v032_write(client, MT9V032_ROW_NOISE_CORR_CONTROL, 0); ++ if (ret < 0) ++ return ret; ++ ++ return v4l2_ctrl_handler_setup(&mt9v032->ctrls); ++} ++ ++/* ----------------------------------------------------------------------------- ++ * V4L2 subdev video operations ++ */ ++ ++static struct v4l2_mbus_framefmt * ++__mt9v032_get_pad_format(struct mt9v032 *mt9v032, 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 &mt9v032->format; ++ default: ++ return NULL; ++ } ++} ++ ++static struct v4l2_rect * ++__mt9v032_get_pad_crop(struct mt9v032 *mt9v032, 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_crop(fh, pad); ++ case V4L2_SUBDEV_FORMAT_ACTIVE: ++ return &mt9v032->crop; ++ default: ++ return NULL; ++ } ++} ++ ++static int mt9v032_s_stream(struct v4l2_subdev *subdev, int enable) ++{ ++ const u16 mode = MT9V032_CHIP_CONTROL_MASTER_MODE ++ | MT9V032_CHIP_CONTROL_DOUT_ENABLE ++ | MT9V032_CHIP_CONTROL_SEQUENTIAL; ++ struct i2c_client *client = v4l2_get_subdevdata(subdev); ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ struct v4l2_mbus_framefmt *format = &mt9v032->format; ++ struct v4l2_rect *crop = &mt9v032->crop; ++ unsigned int hratio; ++ unsigned int vratio; ++ int ret; ++ ++ if (!enable) ++ return mt9v032_set_chip_control(mt9v032, mode, 0); ++ ++ /* Configure the window size and row/column bin */ ++ hratio = DIV_ROUND_CLOSEST(crop->width, format->width); ++ vratio = DIV_ROUND_CLOSEST(crop->height, format->height); ++ ++ ret = mt9v032_write(client, MT9V032_READ_MODE, ++ (hratio - 1) << MT9V032_READ_MODE_ROW_BIN_SHIFT | ++ (vratio - 1) << MT9V032_READ_MODE_COLUMN_BIN_SHIFT); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_COLUMN_START, crop->left); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_ROW_START, crop->top); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_WINDOW_WIDTH, crop->width); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_WINDOW_HEIGHT, crop->height); ++ if (ret < 0) ++ return ret; ++ ++ ret = mt9v032_write(client, MT9V032_HORIZONTAL_BLANKING, ++ max(43, 660 - crop->width)); ++ if (ret < 0) ++ return ret; ++ ++ /* Switch to master "normal" mode */ ++ return mt9v032_set_chip_control(mt9v032, 0, mode); ++} ++ ++static int mt9v032_enum_mbus_code(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 mt9v032_enum_frame_size(struct v4l2_subdev *subdev, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_frame_size_enum *fse) ++{ ++ if (fse->index >= 8 || fse->code != V4L2_MBUS_FMT_SGRBG10_1X10) ++ return -EINVAL; ++ ++ fse->min_width = MT9V032_WINDOW_WIDTH_DEF / fse->index; ++ fse->max_width = fse->min_width; ++ fse->min_height = MT9V032_WINDOW_HEIGHT_DEF / fse->index; ++ fse->max_height = fse->min_height; ++ ++ return 0; ++} ++ ++static int mt9v032_get_format(struct v4l2_subdev *subdev, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *format) ++{ ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ ++ format->format = *__mt9v032_get_pad_format(mt9v032, fh, format->pad, ++ format->which); ++ return 0; ++} ++ ++static int mt9v032_set_format(struct v4l2_subdev *subdev, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_format *format) ++{ ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ struct v4l2_mbus_framefmt *__format; ++ struct v4l2_rect *__crop; ++ unsigned int width; ++ unsigned int height; ++ unsigned int hratio; ++ unsigned int vratio; ++ ++ __crop = __mt9v032_get_pad_crop(mt9v032, fh, format->pad, ++ format->which); ++ ++ /* Clamp the width and height to avoid dividing by zero. */ ++ width = clamp_t(unsigned int, ALIGN(format->format.width, 2), ++ max(__crop->width / 8, MT9V032_WINDOW_WIDTH_MIN), ++ __crop->width); ++ height = clamp_t(unsigned int, ALIGN(format->format.height, 2), ++ max(__crop->height / 8, MT9V032_WINDOW_HEIGHT_MIN), ++ __crop->height); ++ ++ hratio = DIV_ROUND_CLOSEST(__crop->width, width); ++ vratio = DIV_ROUND_CLOSEST(__crop->height, height); ++ ++ __format = __mt9v032_get_pad_format(mt9v032, fh, format->pad, ++ format->which); ++ __format->width = __crop->width / hratio; ++ __format->height = __crop->height / vratio; ++ ++ format->format = *__format; ++ ++ return 0; ++} ++ ++static int mt9v032_get_crop(struct v4l2_subdev *subdev, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ ++ crop->rect = *__mt9v032_get_pad_crop(mt9v032, fh, crop->pad, ++ crop->which); ++ return 0; ++} ++ ++static int mt9v032_set_crop(struct v4l2_subdev *subdev, ++ struct v4l2_subdev_fh *fh, ++ struct v4l2_subdev_crop *crop) ++{ ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ struct v4l2_mbus_framefmt *__format; ++ struct v4l2_rect *__crop; ++ struct v4l2_rect rect; ++ ++ /* Clamp the crop rectangle boundaries and align them to a non multiple ++ * of 2 pixels to ensure a GRBG Bayer pattern. ++ */ ++ rect.left = clamp(ALIGN(crop->rect.left + 1, 2) - 1, ++ MT9V032_COLUMN_START_MIN, ++ MT9V032_COLUMN_START_MAX); ++ rect.top = clamp(ALIGN(crop->rect.top + 1, 2) - 1, ++ MT9V032_ROW_START_MIN, ++ MT9V032_ROW_START_MAX); ++ rect.width = clamp(ALIGN(crop->rect.width, 2), ++ MT9V032_WINDOW_WIDTH_MIN, ++ MT9V032_WINDOW_WIDTH_MAX); ++ rect.height = clamp(ALIGN(crop->rect.height, 2), ++ MT9V032_WINDOW_HEIGHT_MIN, ++ MT9V032_WINDOW_HEIGHT_MAX); ++ ++ rect.width = min(rect.width, MT9V032_PIXEL_ARRAY_WIDTH - rect.left); ++ rect.height = min(rect.height, MT9V032_PIXEL_ARRAY_HEIGHT - rect.top); ++ ++ __crop = __mt9v032_get_pad_crop(mt9v032, fh, crop->pad, crop->which); ++ ++ if (rect.width != __crop->width || rect.height != __crop->height) { ++ /* Reset the output image size if the crop rectangle size has ++ * been modified. ++ */ ++ __format = __mt9v032_get_pad_format(mt9v032, fh, crop->pad, ++ crop->which); ++ __format->width = rect.width; ++ __format->height = rect.height; ++ } ++ ++ *__crop = rect; ++ crop->rect = rect; ++ ++ return 0; ++} ++ ++/* ----------------------------------------------------------------------------- ++ * V4L2 subdev control operations ++ */ ++ ++#define V4L2_CID_TEST_PATTERN (V4L2_CID_USER_BASE | 0x1001) ++ ++static int mt9v032_s_ctrl(struct v4l2_ctrl *ctrl) ++{ ++ struct mt9v032 *mt9v032 = ++ container_of(ctrl->handler, struct mt9v032, ctrls); ++ struct i2c_client *client = v4l2_get_subdevdata(&mt9v032->subdev); ++ u16 data; ++ ++ switch (ctrl->id) { ++ case V4L2_CID_AUTOGAIN: ++ return mt9v032_update_aec_agc(mt9v032, MT9V032_AGC_ENABLE, ++ ctrl->val); ++ ++ case V4L2_CID_GAIN: ++ return mt9v032_write(client, MT9V032_ANALOG_GAIN, ctrl->val); ++ ++ case V4L2_CID_EXPOSURE_AUTO: ++ return mt9v032_update_aec_agc(mt9v032, MT9V032_AEC_ENABLE, ++ ctrl->val); ++ ++ case V4L2_CID_EXPOSURE: ++ return mt9v032_write(client, MT9V032_TOTAL_SHUTTER_WIDTH, ++ ctrl->val); ++ ++ case V4L2_CID_TEST_PATTERN: ++ switch (ctrl->val) { ++ case 0: ++ data = 0; ++ break; ++ case 1: ++ data = MT9V032_TEST_PATTERN_GRAY_VERTICAL ++ | MT9V032_TEST_PATTERN_ENABLE; ++ break; ++ case 2: ++ data = MT9V032_TEST_PATTERN_GRAY_HORIZONTAL ++ | MT9V032_TEST_PATTERN_ENABLE; ++ break; ++ case 3: ++ data = MT9V032_TEST_PATTERN_GRAY_DIAGONAL ++ | MT9V032_TEST_PATTERN_ENABLE; ++ break; ++ default: ++ data = (ctrl->val << MT9V032_TEST_PATTERN_DATA_SHIFT) ++ | MT9V032_TEST_PATTERN_USE_DATA ++ | MT9V032_TEST_PATTERN_ENABLE ++ | MT9V032_TEST_PATTERN_FLIP; ++ break; ++ } ++ ++ return mt9v032_write(client, MT9V032_TEST_PATTERN, data); ++ } ++ ++ return 0; ++} ++ ++static struct v4l2_ctrl_ops mt9v032_ctrl_ops = { ++ .s_ctrl = mt9v032_s_ctrl, ++}; ++ ++static const struct v4l2_ctrl_config mt9v032_ctrls[] = { ++ { ++ .ops = &mt9v032_ctrl_ops, ++ .id = V4L2_CID_TEST_PATTERN, ++ .type = V4L2_CTRL_TYPE_INTEGER, ++ .name = "Test pattern", ++ .min = 0, ++ .max = 1023, ++ .step = 1, ++ .def = 0, ++ .flags = 0, ++ } ++}; ++ ++/* ----------------------------------------------------------------------------- ++ * V4L2 subdev core operations ++ */ ++ ++static int mt9v032_set_power(struct v4l2_subdev *subdev, int on) ++{ ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ int ret = 0; ++ ++ mutex_lock(&mt9v032->power_lock); ++ ++ /* If the power count is modified from 0 to != 0 or from != 0 to 0, ++ * update the power state. ++ */ ++ if (mt9v032->power_count == !on) { ++ ret = __mt9v032_set_power(mt9v032, !!on); ++ if (ret < 0) ++ goto done; ++ } ++ ++ /* Update the power count. */ ++ mt9v032->power_count += on ? 1 : -1; ++ WARN_ON(mt9v032->power_count < 0); ++ ++done: ++ mutex_unlock(&mt9v032->power_lock); ++ return ret; ++} ++ ++/* ----------------------------------------------------------------------------- ++ * V4L2 subdev internal operations ++ */ ++ ++static int mt9v032_registered(struct v4l2_subdev *subdev) ++{ ++ struct i2c_client *client = v4l2_get_subdevdata(subdev); ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ s32 data; ++ int ret; ++ ++ dev_info(&client->dev, "Probing MT9V032 at address 0x%02x\n", ++ client->addr); ++ ++ ret = mt9v032_power_on(mt9v032); ++ if (ret < 0) { ++ dev_err(&client->dev, "MT9V032 power up failed\n"); ++ return ret; ++ } ++ ++ /* Read and check the sensor version */ ++ data = mt9v032_read(client, MT9V032_CHIP_VERSION); ++ if (data != MT9V032_CHIP_ID_REV1 && data != MT9V032_CHIP_ID_REV3) { ++ dev_err(&client->dev, "MT9V032 not detected, wrong version " ++ "0x%04x\n", data); ++ return -ENODEV; ++ } ++ ++ mt9v032_power_off(mt9v032); ++ ++ dev_info(&client->dev, "MT9V032 detected at address 0x%02x\n", ++ client->addr); ++ ++ return ret; ++} ++ ++static int mt9v032_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) ++{ ++ struct v4l2_mbus_framefmt *format; ++ struct v4l2_rect *crop; ++ ++ crop = v4l2_subdev_get_try_crop(fh, 0); ++ crop->left = MT9V032_COLUMN_START_DEF; ++ crop->top = MT9V032_ROW_START_DEF; ++ crop->width = MT9V032_WINDOW_WIDTH_DEF; ++ crop->height = MT9V032_WINDOW_HEIGHT_DEF; ++ ++ format = v4l2_subdev_get_try_format(fh, 0); ++ format->code = V4L2_MBUS_FMT_SGRBG10_1X10; ++ format->width = MT9V032_WINDOW_WIDTH_DEF; ++ format->height = MT9V032_WINDOW_HEIGHT_DEF; ++ format->field = V4L2_FIELD_NONE; ++ format->colorspace = V4L2_COLORSPACE_SRGB; ++ ++ return mt9v032_set_power(subdev, 1); ++} ++ ++static int mt9v032_close(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh) ++{ ++ return mt9v032_set_power(subdev, 0); ++} ++ ++static struct v4l2_subdev_core_ops mt9v032_subdev_core_ops = { ++ .s_power = mt9v032_set_power, ++}; ++ ++static struct v4l2_subdev_video_ops mt9v032_subdev_video_ops = { ++ .s_stream = mt9v032_s_stream, ++}; ++ ++static struct v4l2_subdev_pad_ops mt9v032_subdev_pad_ops = { ++ .enum_mbus_code = mt9v032_enum_mbus_code, ++ .enum_frame_size = mt9v032_enum_frame_size, ++ .get_fmt = mt9v032_get_format, ++ .set_fmt = mt9v032_set_format, ++ .get_crop = mt9v032_get_crop, ++ .set_crop = mt9v032_set_crop, ++}; ++ ++static struct v4l2_subdev_ops mt9v032_subdev_ops = { ++ .core = &mt9v032_subdev_core_ops, ++ .video = &mt9v032_subdev_video_ops, ++ .pad = &mt9v032_subdev_pad_ops, ++}; ++ ++static const struct v4l2_subdev_internal_ops mt9v032_subdev_internal_ops = { ++ .registered = mt9v032_registered, ++ .open = mt9v032_open, ++ .close = mt9v032_close, ++}; ++ ++/* ----------------------------------------------------------------------------- ++ * Driver initialization and probing ++ */ ++ ++static int mt9v032_probe(struct i2c_client *client, ++ const struct i2c_device_id *did) ++{ ++ struct mt9v032 *mt9v032; ++ unsigned int i; ++ int ret; ++ ++ if (!i2c_check_functionality(client->adapter, ++ I2C_FUNC_SMBUS_WORD_DATA)) { ++ dev_warn(&client->adapter->dev, ++ "I2C-Adapter doesn't support I2C_FUNC_SMBUS_WORD\n"); ++ return -EIO; ++ } ++ ++ mt9v032 = kzalloc(sizeof(*mt9v032), GFP_KERNEL); ++ if (!mt9v032) ++ return -ENOMEM; ++ ++ mutex_init(&mt9v032->power_lock); ++ mt9v032->pdata = client->dev.platform_data; ++ ++ v4l2_ctrl_handler_init(&mt9v032->ctrls, ARRAY_SIZE(mt9v032_ctrls) + 4); ++ ++ v4l2_ctrl_new_std(&mt9v032->ctrls, &mt9v032_ctrl_ops, ++ V4L2_CID_AUTOGAIN, 0, 1, 1, 1); ++ v4l2_ctrl_new_std(&mt9v032->ctrls, &mt9v032_ctrl_ops, ++ V4L2_CID_GAIN, MT9V032_ANALOG_GAIN_MIN, ++ MT9V032_ANALOG_GAIN_MAX, 1, MT9V032_ANALOG_GAIN_DEF); ++ v4l2_ctrl_new_std_menu(&mt9v032->ctrls, &mt9v032_ctrl_ops, ++ V4L2_CID_EXPOSURE_AUTO, V4L2_EXPOSURE_MANUAL, 0, ++ V4L2_EXPOSURE_AUTO); ++ v4l2_ctrl_new_std(&mt9v032->ctrls, &mt9v032_ctrl_ops, ++ V4L2_CID_EXPOSURE, MT9V032_TOTAL_SHUTTER_WIDTH_MIN, ++ MT9V032_TOTAL_SHUTTER_WIDTH_MAX, 1, ++ MT9V032_TOTAL_SHUTTER_WIDTH_DEF); ++ ++ for (i = 0; i < ARRAY_SIZE(mt9v032_ctrls); ++i) ++ v4l2_ctrl_new_custom(&mt9v032->ctrls, &mt9v032_ctrls[i], NULL); ++ ++ mt9v032->subdev.ctrl_handler = &mt9v032->ctrls; ++ ++ if (mt9v032->ctrls.error) ++ printk(KERN_INFO "%s: control initialization error %d\n", ++ __func__, mt9v032->ctrls.error); ++ ++ mt9v032->crop.left = MT9V032_COLUMN_START_DEF; ++ mt9v032->crop.top = MT9V032_ROW_START_DEF; ++ mt9v032->crop.width = MT9V032_WINDOW_WIDTH_DEF; ++ mt9v032->crop.height = MT9V032_WINDOW_HEIGHT_DEF; ++ ++ mt9v032->format.code = V4L2_MBUS_FMT_SGRBG10_1X10; ++ mt9v032->format.width = MT9V032_WINDOW_WIDTH_DEF; ++ mt9v032->format.height = MT9V032_WINDOW_HEIGHT_DEF; ++ mt9v032->format.field = V4L2_FIELD_NONE; ++ mt9v032->format.colorspace = V4L2_COLORSPACE_SRGB; ++ ++ mt9v032->aec_agc = MT9V032_AEC_ENABLE | MT9V032_AGC_ENABLE; ++ ++ v4l2_i2c_subdev_init(&mt9v032->subdev, client, &mt9v032_subdev_ops); ++ mt9v032->subdev.internal_ops = &mt9v032_subdev_internal_ops; ++ mt9v032->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; ++ ++ mt9v032->pad.flags = MEDIA_PAD_FL_SOURCE; ++ ret = media_entity_init(&mt9v032->subdev.entity, 1, &mt9v032->pad, 0); ++ if (ret < 0) ++ kfree(mt9v032); ++ ++ return ret; ++} ++ ++static int mt9v032_remove(struct i2c_client *client) ++{ ++ struct v4l2_subdev *subdev = i2c_get_clientdata(client); ++ struct mt9v032 *mt9v032 = to_mt9v032(subdev); ++ ++ v4l2_device_unregister_subdev(subdev); ++ media_entity_cleanup(&subdev->entity); ++ kfree(mt9v032); ++ return 0; ++} ++ ++static const struct i2c_device_id mt9v032_id[] = { ++ { "mt9v032", 0 }, ++ { } ++}; ++MODULE_DEVICE_TABLE(i2c, mt9v032_id); ++ ++static struct i2c_driver mt9v032_driver = { ++ .driver = { ++ .name = "mt9v032", ++ }, ++ .probe = mt9v032_probe, ++ .remove = mt9v032_remove, ++ .id_table = mt9v032_id, ++}; ++ ++static int __init mt9v032_init(void) ++{ ++ return i2c_add_driver(&mt9v032_driver); ++} ++ ++static void __exit mt9v032_exit(void) ++{ ++ i2c_del_driver(&mt9v032_driver); ++} ++ ++module_init(mt9v032_init); ++module_exit(mt9v032_exit); ++ ++MODULE_DESCRIPTION("Aptina MT9V032 Camera driver"); ++MODULE_AUTHOR("Laurent Pinchart "); ++MODULE_LICENSE("GPL"); +diff --git a/include/media/mt9v032.h b/include/media/mt9v032.h +new file mode 100644 +index 0000000..5e27f9b +--- /dev/null ++++ b/include/media/mt9v032.h +@@ -0,0 +1,12 @@ ++#ifndef _MEDIA_MT9V032_H ++#define _MEDIA_MT9V032_H ++ ++struct v4l2_subdev; ++ ++struct mt9v032_platform_data { ++ unsigned int clk_pol:1; ++ ++ void (*set_clock)(struct v4l2_subdev *subdev, unsigned int rate); ++}; ++ ++#endif +-- +1.6.6.1 + diff --git a/recipes-kernel/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch b/recipes-kernel/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch new file mode 100644 index 00000000..31c525e2 --- /dev/null +++ b/recipes-kernel/linux/linux-omap-2.6.39/camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch @@ -0,0 +1,162 @@ +From c53e55e3d361eb79bc8fc27971428fc37d804ea9 Mon Sep 17 00:00:00 2001 +From: Javier Martin +Date: Mon, 30 May 2011 10:37:17 +0200 +Subject: [PATCH 3/3] Add support for mt9p031 (LI-5M03 module) in Beagleboard xM. + +Since isp clocks have not been exposed yet, this patch +includes a temporal solution for testing mt9p031 driver +in Beagleboard xM. + +Signed-off-by: Javier Martin +--- + arch/arm/mach-omap2/Makefile | 1 + + arch/arm/mach-omap2/board-omap3beagle-camera.c | 95 ++++++++++++++++++++++++ + arch/arm/mach-omap2/board-omap3beagle.c | 5 + + 3 files changed, 101 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-omap2/board-omap3beagle-camera.c + +diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile +index 512b152..05cd983 100644 +--- a/arch/arm/mach-omap2/Makefile ++++ b/arch/arm/mach-omap2/Makefile +@@ -179,6 +179,7 @@ obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \ + hsmmc.o + obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o + obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \ ++ board-omap3beagle-camera.o \ + hsmmc.o + obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o \ + hsmmc.o +diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c +new file mode 100644 +index 0000000..2632557 +--- /dev/null ++++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c +@@ -0,0 +1,95 @@ ++#include ++#include ++ ++#include ++ ++#include ++#include ++#include "devices.h" ++#include "../../../drivers/media/video/omap3isp/isp.h" ++ ++#define MT9P031_RESET_GPIO 98 ++#define MT9P031_XCLK ISP_XCLK_A ++ ++static struct regulator *reg_1v8, *reg_2v8; ++ ++static int beagle_cam_set_xclk(struct v4l2_subdev *subdev, int hz) ++{ ++ struct isp_device *isp = v4l2_dev_to_isp_device(subdev->v4l2_dev); ++ int ret; ++ ++ ret = isp->platform_cb.set_xclk(isp, hz, MT9P031_XCLK); ++ return 0; ++} ++ ++static int beagle_cam_reset(struct v4l2_subdev *subdev, int active) ++{ ++ /* Set RESET_BAR to !active */ ++ gpio_set_value(MT9P031_RESET_GPIO, !active); ++ ++ return 0; ++} ++ ++static struct mt9p031_platform_data beagle_mt9p031_platform_data = { ++ .set_xclk = beagle_cam_set_xclk, ++ .reset = beagle_cam_reset, ++ .vdd_io = MT9P031_VDD_IO_1V8, ++ .version = MT9P031_COLOR_VERSION, ++}; ++ ++static struct i2c_board_info mt9p031_camera_i2c_device = { ++ I2C_BOARD_INFO("mt9p031", 0x48), ++ .platform_data = &beagle_mt9p031_platform_data, ++}; ++ ++static struct isp_subdev_i2c_board_info mt9p031_camera_subdevs[] = { ++ { ++ .board_info = &mt9p031_camera_i2c_device, ++ .i2c_adapter_id = 2, ++ }, ++ { NULL, 0, }, ++}; ++ ++static struct isp_v4l2_subdevs_group beagle_camera_subdevs[] = { ++ { ++ .subdevs = mt9p031_camera_subdevs, ++ .interface = ISP_INTERFACE_PARALLEL, ++ .bus = { ++ .parallel = { ++ .data_lane_shift = 0, ++ .clk_pol = 1, ++ .bridge = ISPCTRL_PAR_BRIDGE_DISABLE, ++ } ++ }, ++ }, ++ { }, ++}; ++ ++static struct isp_platform_data beagle_isp_platform_data = { ++ .subdevs = beagle_camera_subdevs, ++}; ++ ++static int __init beagle_camera_init(void) ++{ ++ if (!machine_is_omap3_beagle() || !cpu_is_omap3630()) ++ return 0; ++ ++ reg_1v8 = regulator_get(NULL, "cam_1v8"); ++ if (IS_ERR(reg_1v8)) ++ pr_err("%s: cannot get cam_1v8 regulator\n", __func__); ++ else ++ regulator_enable(reg_1v8); ++ ++ reg_2v8 = regulator_get(NULL, "cam_2v8"); ++ if (IS_ERR(reg_2v8)) ++ pr_err("%s: cannot get cam_2v8 regulator\n", __func__); ++ else ++ regulator_enable(reg_2v8); ++ ++ omap_register_i2c_bus(2, 100, NULL, 0); ++ gpio_request(MT9P031_RESET_GPIO, "cam_rst"); ++ gpio_direction_output(MT9P031_RESET_GPIO, 0); ++ omap3_init_camera(&beagle_isp_platform_data); ++ return 0; ++} ++late_initcall(beagle_camera_init); +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 221bfda..dd6e31f 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -25,12 +25,16 @@ + #include + #include + #include ++#include ++#include ++#include + + #include + #include + #include + #include + ++#include + #include + #include + +@@ -48,6 +52,7 @@ + #include + #include + #include ++#include + + #include "mux.h" + #include "hsmmc.h" +-- +1.6.6.1 + -- cgit v1.2.3-54-g00ecf