linux-omap 2.6.39: add v5 of mt9p031 support

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

7 files changed, 937 insertions, 1101 deletions

diff --git a/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-driver.patch b/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-driver.patch
deleted file mode 100644
index 9746415fdc..0000000000
--- a/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-driver.patch
+++ /dev/null
@@ -1,918 +0,0 @@
-From 327e65fc0d86911bda7c1f37fb5c3534d1b2c849 Mon Sep 17 00:00:00 2001
-From: Javier Martin <javier.martin@vista-silicon.com>
-Date: Thu, 26 May 2011 07:20:53 +0000
-Subject: [PATCH 1/4] Add mt9p031 sensor driver.
-
-This patch applies on 2.6.39 (commit 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf).
-It has some power management issue which causes horizontal random lines on
-the image. If we do not disable 1v8 regulator, the problem disappears.
-I would like to get some help on fixing whatever the problem with power
-management is.
-
-Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
----
- drivers/media/video/Kconfig   |    7 +
- drivers/media/video/Makefile  |    1 +
- drivers/media/video/mt9p031.c |  841 +++++++++++++++++++++++++++++++++++++++++
- include/media/mt9p031.h       |   11 +
- 4 files changed, 860 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..242bea9
---- /dev/null
-+++ b/drivers/media/video/mt9p031.c
-@@ -0,0 +1,841 @@
-+/*
-+ * Driver for MT9P031 CMOS Image Sensor from Aptina
-+ *
-+ * Copyright (C) 2011, Javier Martin <javier.martin@vista-silicon.com>
-+ *
-+ * Copyright (C) 2011, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
-+ *
-+ * 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 <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/i2c.h>
-+#include <linux/log2.h>
-+#include <linux/pm.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/slab.h>
-+#include <media/v4l2-subdev.h>
-+#include <linux/videodev2.h>
-+
-+#include <media/mt9p031.h>
-+#include <media/v4l2-chip-ident.h>
-+#include <media/v4l2-subdev.h>
-+#include <media/v4l2-device.h>
-+
-+#define MT9P031_PIXCLK_FREQ                    54000000
-+
-+/* mt9p031 selected register addresses */
-+#define MT9P031_CHIP_VERSION                   0x00
-+#define                MT9P031_CHIP_VERSION_VALUE      0x1801
-+#define MT9P031_ROW_START                      0x01
-+#define                MT9P031_ROW_START_DEF           54
-+#define MT9P031_COLUMN_START                   0x02
-+#define                MT9P031_COLUMN_START_DEF        16
-+#define MT9P031_WINDOW_HEIGHT                  0x03
-+#define MT9P031_WINDOW_WIDTH                   0x04
-+#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_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
-+
-+#define MT9P031_WINDOW_HEIGHT_MAX              1944
-+#define MT9P031_WINDOW_WIDTH_MAX               2592
-+#define MT9P031_WINDOW_HEIGHT_MIN              2
-+#define MT9P031_WINDOW_WIDTH_MIN               18
-+
-+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;
-+       u16 h_blanking;
-+       u16 v_blanking;
-+       u16 column_address_mode;
-+       u16 row_address_mode;
-+       u16 column_start;
-+       u16 row_start;
-+       u16 window_width;
-+       u16 window_height;
-+       struct regulator *reg_1v8;
-+       struct regulator *reg_2v8;
-+};
-+
-+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 reg_write_cached(struct i2c_client *client, const u8 reg,
-+                       const u16 data, u16 *cache)
-+{
-+       int ret;
-+
-+       ret = reg_write(client, reg, data);
-+       if (ret < 0)
-+               return ret;
-+       *cache = data;
-+       return 0;
-+}
-+
-+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;
-+
-+       return reg_write_cached(client, MT9P031_OUTPUT_CONTROL, value,
-+                               &mt9p031->output_control);
-+}
-+
-+static int restore_registers(struct i2c_client *client)
-+{
-+       int ret;
-+       struct mt9p031 *mt9p031 = to_mt9p031(client);
-+
-+       /* Disable register update, reconfigure atomically */
-+       ret = mt9p031_set_output_control(mt9p031, 0,
-+                                       MT9P031_OUTPUT_CONTROL_SYN);
-+       if (ret < 0)
-+               return ret;
-+
-+       /* Blanking and start values - default... */
-+       ret = reg_write(client, MT9P031_H_BLANKING, mt9p031->h_blanking);
-+       if (ret < 0)
-+               return ret;
-+
-+       ret = reg_write(client, MT9P031_V_BLANKING, mt9p031->v_blanking);
-+       if (ret < 0)
-+               return ret;
-+
-+       ret = reg_write(client, MT9P031_COLUMN_ADDRESS_MODE,
-+                               mt9p031->column_address_mode);
-+       if (ret < 0)
-+               return ret;
-+
-+       ret = reg_write(client, MT9P031_ROW_ADDRESS_MODE,
-+                               mt9p031->row_address_mode);
-+       if (ret < 0)
-+               return ret;
-+
-+       ret = reg_write(client, MT9P031_COLUMN_START,
-+                               mt9p031->column_start);
-+       if (ret < 0)
-+               return ret;
-+
-+       ret = reg_write(client, MT9P031_ROW_START,
-+                               mt9p031->row_start);
-+       if (ret < 0)
-+               return ret;
-+
-+       ret = reg_write(client, MT9P031_WINDOW_WIDTH,
-+                               mt9p031->window_width);
-+       if (ret < 0)
-+               return ret;
-+
-+       ret = reg_write(client, MT9P031_WINDOW_HEIGHT,
-+                               mt9p031->window_height);
-+       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;
-+       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);
-+       /* turn on digital supply first */
-+       ret = regulator_enable(mt9p031->reg_1v8);
-+       if (ret) {
-+               dev_err(&client->dev,
-+                       "Failed to enable 1.8v regulator: %d\n", ret);
-+               goto err_1v8;
-+       }
-+       /* now turn on analog supply */
-+       ret = regulator_enable(mt9p031->reg_2v8);
-+       if (ret) {
-+               dev_err(&client->dev,
-+                       "Failed to enable 2.8v regulator: %d\n", ret);
-+               goto err_rst;
-+       }
-+       /* Now RESET_BAR must be high */
-+       if (mt9p031->pdata->reset)
-+               mt9p031->pdata->reset(&mt9p031->subdev, 0);
-+
-+       if (mt9p031->pdata->set_xclk)
-+               mt9p031->pdata->set_xclk(&mt9p031->subdev, MT9P031_PIXCLK_FREQ);
-+
-+       /* soft reset */
-+       ret = mt9p031_reset(client);
-+       if (ret < 0) {
-+               dev_err(&client->dev, "Failed to reset the camera\n");
-+               goto err_rst;
-+       }
-+
-+       ret = restore_registers(client);
-+       if (ret < 0) {
-+               dev_err(&client->dev, "Failed to restore registers\n");
-+               goto err_rst;
-+       }
-+
-+       return 0;
-+err_rst:
-+       regulator_disable(mt9p031->reg_1v8);
-+err_1v8:
-+       return ret;
-+
-+}
-+
-+static void mt9p031_power_off(struct mt9p031 *mt9p031)
-+{
-+       if (mt9p031->pdata->set_xclk)
-+               mt9p031->pdata->set_xclk(&mt9p031->subdev, 0);
-+       if (mt9p031->pdata->reset)
-+               mt9p031->pdata->reset(&mt9p031->subdev, 1);
-+       regulator_disable(mt9p031->reg_1v8);
-+       regulator_disable(mt9p031->reg_2v8);
-+}
-+
-+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, top, width, height;
-+
-+       /*
-+        * 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);
-+       }
-+       top = rect->top & (~1);
-+       width = rect->width;
-+       height = rect->height;
-+
-+       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_cached(client, MT9P031_H_BLANKING, hblank,
-+                               &mt9p031->h_blanking);
-+       if (ret < 0)
-+               return ret;
-+       ret = reg_write_cached(client, MT9P031_V_BLANKING, vblank,
-+                               &mt9p031->v_blanking);
-+       if (ret < 0)
-+               return ret;
-+
-+       ret = reg_write_cached(client, MT9P031_COLUMN_ADDRESS_MODE,
-+                               ((xbin - 1) << 4) | (xskip - 1),
-+                               &mt9p031->column_address_mode);
-+       if (ret < 0)
-+               return ret;
-+       ret = reg_write_cached(client, MT9P031_ROW_ADDRESS_MODE,
-+                               ((ybin - 1) << 4) | (yskip - 1),
-+                               &mt9p031->row_address_mode);
-+       if (ret < 0)
-+               return ret;
-+
-+       dev_dbg(&client->dev, "new physical left %u, top %u\n",
-+               rect->left, rect->top);
-+
-+       ret = reg_write_cached(client, MT9P031_COLUMN_START,
-+                               rect->left + MT9P031_COLUMN_START_DEF,
-+                               &mt9p031->column_start);
-+       if (ret < 0)
-+               return ret;
-+       ret = reg_write_cached(client, MT9P031_ROW_START,
-+                               rect->top + MT9P031_ROW_START_DEF,
-+                               &mt9p031->row_start);
-+       if (ret < 0)
-+               return ret;
-+       ret = reg_write_cached(client, MT9P031_WINDOW_WIDTH,
-+                               rect->width - 1,
-+                               &mt9p031->window_width);
-+       if (ret < 0)
-+               return ret;
-+       ret = reg_write_cached(client, MT9P031_WINDOW_HEIGHT,
-+                               rect->height - 1,
-+                               &mt9p031->window_height);
-+       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,
-+                               0, MT9P031_WINDOW_WIDTH_MAX - rect.width), 2);
-+       rect.top = ALIGN(clamp(crop->rect.top,
-+                              0, MT9P031_WINDOW_HEIGHT_MAX - rect.height), 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_fmt_validate(struct v4l2_subdev *sd,
-+                               struct v4l2_subdev_format *fmt)
-+{
-+       struct v4l2_mbus_framefmt *format = &fmt->format;
-+
-+       /* Hardcode code and colorspace as sensor only supports one */
-+       format->code = V4L2_MBUS_FMT_SGRBG12_1X12;
-+       format->colorspace = V4L2_COLORSPACE_SRGB;
-+
-+       format->width = clamp_t(int, ALIGN(format->width, 2), 2,
-+                                               MT9P031_WINDOW_WIDTH_MAX);
-+       format->height = clamp_t(int, ALIGN(format->height, 2), 2,
-+                                               MT9P031_WINDOW_HEIGHT_MAX);
-+       format->field = V4L2_FIELD_NONE;
-+
-+       return 0;
-+}
-+
-+static int mt9p031_set_format(struct v4l2_subdev *sd,
-+                               struct v4l2_subdev_fh *fh,
-+                               struct v4l2_subdev_format *format)
-+{
-+       struct v4l2_subdev_format sdf = *format;
-+       struct v4l2_mbus_framefmt *__format, *format_bak = &sdf.format;
-+       struct v4l2_rect *__crop, rect;
-+       struct mt9p031 *mt9p031 = container_of(sd, struct mt9p031, subdev);
-+       u16 xskip, yskip;
-+       int ret;
-+
-+       __crop = mt9p031_get_pad_crop(mt9p031, fh, format->pad, format->which);
-+
-+       ret = mt9p031_fmt_validate(sd, &sdf);
-+       if (ret < 0)
-+               return ret;
-+       rect.width = __crop->width;
-+       rect.height = __crop->height;
-+
-+       xskip = mt9p031_skip_for_scale(&rect.width, format_bak->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, format_bak->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__,
-+               format_bak->width, format_bak->height, format->which);
-+       if (__crop)
-+               *__crop = rect;
-+
-+       __format = mt9p031_get_pad_format(mt9p031, fh, format->pad, format->which);
-+       *__format = *format_bak;
-+       format->format = *format_bak;
-+
-+       mt9p031->xskip = xskip;
-+       mt9p031->yskip = yskip;
-+       mt9p031->rect = *__crop;
-+       return 0;
-+}
-+
-+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);
-+       } else {
-+               /* Stop sensor readout */
-+               ret = mt9p031_set_output_control(mt9p031,
-+                                               MT9P031_OUTPUT_CONTROL_CEN, 0);
-+       }
-+       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 enable 2.8v regulator: %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);
-+               goto err_pwron;
-+       }
-+
-+       ret = mt9p031_video_probe(client);
-+       if (ret)
-+               goto err_evprobe;
-+
-+       mt9p031->pad.flags = MEDIA_PAD_FL_SOURCE;
-+       ret = media_entity_init(&mt9p031->subdev.entity, 1, &mt9p031->pad, 0);
-+       if (ret)
-+               goto err_evprobe;
-+
-+       mt9p031->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
-+       mt9p031_set_power(&mt9p031->subdev, 0);
-+
-+       return 0;
-+err_evprobe:
-+       mt9p031_set_power(&mt9p031->subdev, 0);
-+err_pwron:
-+       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_MAX;
-+       mt9p031->rect.height    = MT9P031_WINDOW_HEIGHT_MAX;
-+       mt9p031->rect.left      = MT9P031_COLUMN_START_DEF;
-+       mt9p031->rect.top       = MT9P031_ROW_START_DEF;
-+
-+       mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12;
-+       mt9p031->format.width = MT9P031_WINDOW_WIDTH_MAX;
-+       mt9p031->format.height = MT9P031_WINDOW_HEIGHT_MAX;
-+       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)
-+{
-+       struct mt9p031 *mt9p031;
-+       struct mt9p031_platform_data *pdata = client->dev.platform_data;
-+       struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-+       int ret;
-+
-+       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->reg_1v8 = regulator_get(NULL, "cam_1v8");
-+       if (IS_ERR(mt9p031->reg_1v8)) {
-+               ret = PTR_ERR(mt9p031->reg_1v8);
-+               dev_err(mt9p031->subdev.v4l2_dev->dev,
-+                       "Failed 1.8v regulator: %d\n", ret);
-+               goto err_e1v8;
-+       }
-+
-+       mt9p031->reg_2v8 = regulator_get(NULL, "cam_2v8");
-+       if (IS_ERR(mt9p031->reg_2v8)) {
-+               ret = PTR_ERR(mt9p031->reg_2v8);
-+               dev_err(mt9p031->subdev.v4l2_dev->dev,
-+                       "Failed 2.8v regulator: %d\n", ret);
-+               goto err_e2v8;
-+       }
-+       return 0;
-+err_e2v8:
-+       regulator_put(mt9p031->reg_1v8);
-+err_e1v8:
-+       kfree(mt9p031);
-+       return ret;
-+}
-+
-+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);
-+       regulator_put(mt9p031->reg_2v8);
-+       regulator_put(mt9p031->reg_1v8);
-+       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 <hechtb@gmail.com>");
-+MODULE_LICENSE("GPL v2");
-diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h
-new file mode 100644
-index 0000000..7ee9733
---- /dev/null
-+++ b/include/media/mt9p031.h
-@@ -0,0 +1,11 @@
-+#ifndef MT9P031_H
-+#define MT9P031_H
-+
-+struct v4l2_subdev;
-+
-+struct mt9p031_platform_data {
-+       int (*set_xclk)(struct v4l2_subdev *subdev, int hz);
-+       int (*reset)(struct v4l2_subdev *subdev, int active);
-+};
-+
-+#endif
--- 
-1.6.6.1
-
diff --git a/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch b/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch
new file mode 100644
index 0000000000..7f68de4048
--- /dev/null
+++ b/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch
@@ -0,0 +1,773 @@
+From 244f96b15afbd73942762e2c07523d6c5cf68a7e Mon Sep 17 00:00:00 2001
+From: Javier Martin <javier.martin@vista-silicon.com>
+Date: Tue, 31 May 2011 11:46:49 +0200
+Subject: [PATCH 1/3] Add support for mt9p031 Aptina (Micron) sensor.
+
+This patch adds basic support (no controls) for
+mt9p031 sensor. It applies on kernel 2.6.39.
+
+Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
+---
+ drivers/media/video/Kconfig   |    7 +
+ drivers/media/video/Makefile  |    1 +
+ drivers/media/video/mt9p031.c |  699 +++++++++++++++++++++++++++++++++++++++++
+ include/media/mt9p031.h       |   11 +
+ 4 files changed, 718 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..61b46a0
+--- /dev/null
++++ b/drivers/media/video/mt9p031.c
+@@ -0,0 +1,699 @@
++/*
++ * Driver for MT9P031 CMOS Image Sensor from Aptina
++ *
++ * Copyright (C) 2011, Javier Martin <javier.martin@vista-silicon.com>
++ *
++ * Copyright (C) 2011, Guennadi Liakhovetski <g.liakhovetski@gmx.de>
++ *
++ * 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 <linux/delay.h>
++#include <linux/device.h>
++#include <linux/i2c.h>
++#include <linux/log2.h>
++#include <linux/pm.h>
++#include <linux/slab.h>
++#include <media/v4l2-subdev.h>
++#include <linux/videodev2.h>
++
++#include <media/mt9p031.h>
++#include <media/v4l2-chip-ident.h>
++#include <media/v4l2-subdev.h>
++#include <media/v4l2-device.h>
++
++#define MT9P031_PIXCLK_FREQ			54000000
++
++#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_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_PIXCLK_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_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);
++	} else {
++		/* Stop sensor readout */
++		ret = mt9p031_set_output_control(mt9p031,
++						MT9P031_OUTPUT_CONTROL_CEN, 0);
++	}
++	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;
++
++	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 <hechtb@gmail.com>");
++MODULE_LICENSE("GPL v2");
+diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h
+new file mode 100644
+index 0000000..ad37eb3
+--- /dev/null
++++ b/include/media/mt9p031.h
+@@ -0,0 +1,11 @@
++#ifndef MT9P031_H
++#define MT9P031_H
++
++struct v4l2_subdev;
++
++struct mt9p031_platform_data {
++	int (*set_xclk)(struct v4l2_subdev *subdev, int hz);
++	int (*reset)(struct v4l2_subdev *subdev, int active);
++};
++
++#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 68a762b25b..0000000000
--- a/recipes-kernel/linux/linux-omap-2.6.39/camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 186ab3a6cd3f1751b4e60044d8207eb95c4b224a Mon Sep 17 00:00:00 2001
-From: Javier Martin <javier.martin@vista-silicon.com>
-Date: Wed, 25 May 2011 10:09:23 +0200
-Subject: [PATCH 2/4] OMAP3BEAGLE: Add support for mt9p031 sensor driver.
-
-isp.h file has to be included as a temporal measure
-since clocks of the isp are not exposed yet.
-
-Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
----
- arch/arm/mach-omap2/board-omap3beagle.c |   73 ++++++++++++++++++++++++++++++-
- 1 files changed, 72 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 221bfda..9af1cf8 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -25,15 +25,21 @@
- #include <linux/input.h>
- #include <linux/gpio_keys.h>
- #include <linux/opp.h>
-+#include <linux/i2c.h>
-+#include <linux/mm.h>
-+#include <linux/videodev2.h>
- 
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/mtd/nand.h>
- #include <linux/mmc/host.h>
- 
-+#include <linux/gpio.h>
- #include <linux/regulator/machine.h>
- #include <linux/i2c/twl.h>
- 
-+#include <media/mt9p031.h>
-+
- #include <mach/hardware.h>
- #include <asm/mach-types.h>
- #include <asm/mach/arch.h>
-@@ -48,11 +54,17 @@
- #include <plat/nand.h>
- #include <plat/usb.h>
- #include <plat/omap_device.h>
-+#include <plat/i2c.h>
- 
- #include "mux.h"
- #include "hsmmc.h"
- #include "timer-gp.h"
- #include "pm.h"
-+#include "devices.h"
-+#include "../../../drivers/media/video/omap3isp/isp.h"
-+ 
-+#define MT9P031_RESET_GPIO	98
-+#define MT9P031_XCLK		ISP_XCLK_A
- 
- #define NAND_BLOCK_SIZE		SZ_128K
- 
-@@ -734,7 +746,7 @@ static int __init omap3_beagle_i2c_init(void)
- {
- 	omap_register_i2c_bus(1, 2600, beagle_i2c1_boardinfo,
- 			ARRAY_SIZE(beagle_i2c1_boardinfo));
--	omap_register_i2c_bus(2, 400,  beagle_i2c2_boardinfo,
-+	omap_register_i2c_bus(2, 100,  beagle_i2c2_boardinfo,
- 			ARRAY_SIZE(beagle_i2c2_boardinfo));
- 	/* Bus 3 is attached to the DVI port where devices like the pico DLP
- 	 * projector don't work reliably with 400kHz */
-@@ -935,6 +947,60 @@ static void __init beagle_opp_init(void)
- 	return;
- }
- 
-+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,
-+};
-+
-+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 void __init omap3_beagle_init(void)
- {
- 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
-@@ -1024,6 +1090,11 @@ static void __init omap3_beagle_init(void)
- 
- 	beagle_display_init();
- 	beagle_opp_init();
-+
-+	/* Enable camera */
-+	gpio_request(MT9P031_RESET_GPIO, "cam_rst");
-+	gpio_direction_output(MT9P031_RESET_GPIO, 0);
-+	omap3_init_camera(&beagle_isp_platform_data);
- }
- 
- early_param("buddy", expansionboard_setup);
--- 
-1.6.6.1
-
diff --git a/recipes-kernel/linux/linux-omap-2.6.39/camera/0004-v4l-Add-mt9v032-sensor-driver.patch b/recipes-kernel/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch
index 48e41a5490..2b7e9557f2 100644
--- a/recipes-kernel/linux/linux-omap-2.6.39/camera/0004-v4l-Add-mt9v032-sensor-driver.patch
+++ b/recipes-kernel/linux/linux-omap-2.6.39/camera/0002-v4l-Add-mt9v032-sensor-driver.patch
@@ -1,7 +1,7 @@
-From 9b0b5f99896549524c8f88a70f6cf0c0271d730e Mon Sep 17 00:00:00 2001
+From 78fdfee2f749cdcdfa69a008b70c4e5629b9c9df Mon Sep 17 00:00:00 2001
 From: Detlev Casanova <detlev.casanova@gmail.com>
 Date: Sun, 28 Nov 2010 19:07:20 +0100
-Subject: [PATCH 4/4] v4l: Add mt9v032 sensor driver
+Subject: [PATCH 2/3] v4l: Add mt9v032 sensor driver
 
 The MT9V032 is a parallel wide VGA sensor from Aptina (formerly Micron)
 controlled through I2C.
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 0000000000..9f7fb006e2
--- /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,158 @@
+From 6cce194e3d1fbc5d746b192b4d1ff78aef6099cf Mon Sep 17 00:00:00 2001
+From: Javier Martin <javier.martin@vista-silicon.com>
+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 <javier.martin@vista-silicon.com>
+---
+ arch/arm/mach-omap2/Makefile                   |    1 +
+ arch/arm/mach-omap2/board-omap3beagle-camera.c |   91 ++++++++++++++++++++++++
+ arch/arm/mach-omap2/board-omap3beagle.c        |    5 ++
+ 3 files changed, 97 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..8387951
+--- /dev/null
++++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c
+@@ -0,0 +1,91 @@
++#include <linux/gpio.h>
++#include <linux/regulator/machine.h>
++
++#include <plat/i2c.h>
++
++#include <media/mt9p031.h>
++
++#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,
++};
++
++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(cpu_is_omap3630()){
++		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 <linux/input.h>
+ #include <linux/gpio_keys.h>
+ #include <linux/opp.h>
++#include <linux/i2c.h>
++#include <linux/mm.h>
++#include <linux/videodev2.h>
+ 
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ #include <linux/mtd/nand.h>
+ #include <linux/mmc/host.h>
+ 
++#include <linux/gpio.h>
+ #include <linux/regulator/machine.h>
+ #include <linux/i2c/twl.h>
+ 
+@@ -48,6 +52,7 @@
+ #include <plat/nand.h>
+ #include <plat/usb.h>
+ #include <plat/omap_device.h>
++#include <plat/i2c.h>
+ 
+ #include "mux.h"
+ #include "hsmmc.h"
+-- 
+1.6.6.1
+
diff --git a/recipes-kernel/linux/linux-omap-2.6.39/camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch b/recipes-kernel/linux/linux-omap-2.6.39/camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch
deleted file mode 100644
index b7efa4e5db..0000000000
--- a/recipes-kernel/linux/linux-omap-2.6.39/camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 014b3e447a0a9bbed5e238873fefb1a6c660c6a0 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 25 May 2011 10:28:29 +0200
-Subject: [PATCH 3/4] OMAP3: beagle: only init camera on 3630
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- arch/arm/mach-omap2/board-omap3beagle.c |   10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 9af1cf8..80f8ece 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -1091,10 +1091,12 @@ static void __init omap3_beagle_init(void)
- 	beagle_display_init();
- 	beagle_opp_init();
- 
--	/* Enable camera */
--	gpio_request(MT9P031_RESET_GPIO, "cam_rst");
--	gpio_direction_output(MT9P031_RESET_GPIO, 0);
--	omap3_init_camera(&beagle_isp_platform_data);
-+	if (cpu_is_omap3630()) {
-+		/* Enable camera */
-+		gpio_request(MT9P031_RESET_GPIO, "cam_rst");
-+		gpio_direction_output(MT9P031_RESET_GPIO, 0);
-+		omap3_init_camera(&beagle_isp_platform_data);
-+	}
- }
- 
- early_param("buddy", expansionboard_setup);
--- 
-1.6.6.1
-
diff --git a/recipes-kernel/linux/linux-omap_2.6.39.bb b/recipes-kernel/linux/linux-omap_2.6.39.bb
index af99e03797..8c9461ea17 100644
--- a/recipes-kernel/linux/linux-omap_2.6.39.bb
+++ b/recipes-kernel/linux/linux-omap_2.6.39.bb
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(beagleboard)"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
 SRCREV_pn-${PN} = "v2.6.39"
-MACHINE_KERNEL_PR_append = "f"
+MACHINE_KERNEL_PR_append = "g"
 
 FILESPATHPKG_prepend = "linux-omap-2.6.39:"
 
@@ -53,10 +53,9 @@ SRC_URI_append = " \
            file://beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch \
            file://beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch \
            \
-           file://camera/0001-Add-mt9p031-sensor-driver.patch \
-           file://camera/0002-OMAP3BEAGLE-Add-support-for-mt9p031-sensor-driver.patch \
-           file://camera/0003-OMAP3-beagle-only-init-camera-on-3630.patch \
-           file://camera/0004-v4l-Add-mt9v032-sensor-driver.patch \
+           file://camera/0001-Add-support-for-mt9p031-Aptina-Micron-sensor.patch \
+           file://camera/0002-v4l-Add-mt9v032-sensor-driver.patch \
+           file://camera/0003-Add-support-for-mt9p031-LI-5M03-module-in-Beagleboar.patch \
            \
            file://pm/linux-omap-2.6.39-ti-pm/0001-OMAP3-voltage-remove-spurious-pr_notice-for-debugfs.patch \
            file://pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch \