linux-omap 2.6.39: add sensor driver for aptina 5MP and 1GHz hack for beagle

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

8 files changed, 1065 insertions, 39 deletions

diff --git a/recipes-kernel/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch b/recipes-kernel/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch
index 0744729bf2..30063f9de5 100644
--- a/recipes-kernel/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch
+++ b/recipes-kernel/linux/linux-omap-2.6.39/beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch
@@ -1,17 +1,17 @@
-From 8fc22425fa39908fd4a9a0f1954b66fecaf2058a Mon Sep 17 00:00:00 2001
+From 2dd4bf287ad066e3d9e82c239782fb649c6f7fe7 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Fri, 20 May 2011 12:48:37 +0200
-Subject: [PATCH 1/3] OMAP3: beagle: add support for beagleboard xM revision C
+Subject: [PATCH 1/5] OMAP3: beagle: add support for beagleboard xM revision C
 
 The USB enable GPIO has been inverted and the USER button moved.
 
 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 ---
- arch/arm/mach-omap2/board-omap3beagle.c |   32 +++++++++++++++++++++++-------
- 1 files changed, 24 insertions(+), 8 deletions(-)
+ arch/arm/mach-omap2/board-omap3beagle.c |   34 +++++++++++++++++++++++-------
+ 1 files changed, 26 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 2de4b02..1eb1e8e 100644
+index 2de4b02..77bafa8 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -62,7 +62,9 @@
@@ -33,7 +33,7 @@ index 2de4b02..1eb1e8e 100644
  };
  
  static u8 omap3_beagle_version;
-@@ -124,9 +127,17 @@ static void __init omap3_beagle_init_rev(void)
+@@ -124,9 +127,18 @@ static void __init omap3_beagle_init_rev(void)
  		printk(KERN_INFO "OMAP3 Beagle Rev: xM\n");
  		omap3_beagle_version = OMAP3BEAGLE_BOARD_XM;
  		break;
@@ -48,57 +48,59 @@ index 2de4b02..1eb1e8e 100644
  	default:
 -		printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd\n", beagle_rev);
 -		omap3_beagle_version = OMAP3BEAGLE_BOARD_UNKN;
-+		printk(KERN_INFO "OMAP3 Beagle Rev: unknown %hd, assuming xM C or newer\n", beagle_rev);
++		printk(KERN_INFO 
++		"OMAP3 Beagle Rev: unknown %hd, assuming xM C or newer\n", beagle_rev);
 +		omap3_beagle_version = OMAP3BEAGLE_BOARD_XMC;
  	}
  
  	return;
-@@ -278,7 +289,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
+@@ -278,7 +290,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
  {
  	int r;
  
 -	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
-+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) {
++	if (cpu_is_omap3630()) {
  		mmc[0].gpio_wp = -EINVAL;
  	} else if ((omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C1_3) ||
  		(omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_C4)) {
-@@ -298,7 +309,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
+@@ -298,7 +310,8 @@ static int beagle_twl_gpio_setup(struct device *dev,
  	/* REVISIT: need ehci-omap hooks for external VBUS
  	 * power switch and overcurrent detect
  	 */
 -	if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM) {
-+	if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM && omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC) {
++	if (omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XM 
++		&& omap3_beagle_get_rev() != OMAP3BEAGLE_BOARD_XMC) {
  		r = gpio_request(gpio + 1, "EHCI_nOC");
  		if (!r) {
  			r = gpio_direction_input(gpio + 1);
-@@ -320,7 +331,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
+@@ -320,7 +333,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
  		gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
  
  	/* DVI reset GPIO is different between beagle revisions */
 -	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM)
-+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC)
++	if (cpu_is_omap3630()) 
  		beagle_dvi_device.reset_gpio = 129;
  	else
  		beagle_dvi_device.reset_gpio = 170;
-@@ -334,7 +345,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
+@@ -334,7 +347,7 @@ static int beagle_twl_gpio_setup(struct device *dev,
  	 * P7/P8 revisions(prototype): Camera EN
  	 * A2+ revisions (production): LDO (supplies DVI, serial, led blocks)
  	 */
 -	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
-+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) {
++	if (cpu_is_omap3630()) {
  		r = gpio_request(gpio + 1, "nDVI_PWR_EN");
  		if (!r) {
  			r = gpio_direction_output(gpio + 1, 0);
-@@ -625,7 +636,7 @@ static void __init beagle_opp_init(void)
+@@ -625,7 +638,7 @@ static void __init beagle_opp_init(void)
  	}
  
  	/* Custom OPP enabled for XM */
 -	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) {
-+	if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM || omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XMC) {
++	if (cpu_is_omap3630()) {
  		struct omap_hwmod *mh = omap_hwmod_lookup("mpu");
  		struct omap_hwmod *dh = omap_hwmod_lookup("iva");
  		struct device *dev;
-@@ -665,6 +676,11 @@ static void __init omap3_beagle_init(void)
+@@ -665,6 +678,11 @@ static void __init omap3_beagle_init(void)
  	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
  	omap3_beagle_init_rev();
  	omap3_beagle_i2c_init();
diff --git a/recipes-kernel/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch b/recipes-kernel/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch
index 74c731f9c7..f815a58ac4 100644
--- a/recipes-kernel/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch
+++ b/recipes-kernel/linux/linux-omap-2.6.39/beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch
@@ -1,7 +1,7 @@
-From 4757e98441d91244c5b1429bdc3d8771e78bb478 Mon Sep 17 00:00:00 2001
+From 258a21a495a9ba2238081cd473b4796cd61a60e7 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Fri, 20 May 2011 13:06:24 +0200
-Subject: [PATCH 2/3] OMAP3: beagle: add support for expansionboards
+Subject: [PATCH 2/5] OMAP3: beagle: add support for expansionboards
 
 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  1 files changed, 269 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 1eb1e8e..70ed6f3 100644
+index 77bafa8..db285e1 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -21,6 +21,7 @@
@@ -20,7 +20,7 @@ index 1eb1e8e..70ed6f3 100644
  #include <linux/input.h>
  #include <linux/gpio_keys.h>
  #include <linux/opp.h>
-@@ -153,6 +154,167 @@ fail0:
+@@ -154,6 +155,167 @@ fail0:
  	return;
  }
  
@@ -188,7 +188,7 @@ index 1eb1e8e..70ed6f3 100644
  static struct mtd_partition omap3beagle_nand_partitions[] = {
  	/* All the partition sizes are listed in terms of NAND block size */
  	{
-@@ -271,6 +433,12 @@ static struct omap2_hsmmc_info mmc[] = {
+@@ -272,6 +434,12 @@ static struct omap2_hsmmc_info mmc[] = {
  		.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
  		.gpio_wp	= 29,
  	},
@@ -201,7 +201,7 @@ index 1eb1e8e..70ed6f3 100644
  	{}	/* Terminator */
  };
  
-@@ -300,11 +468,25 @@ static int beagle_twl_gpio_setup(struct device *dev,
+@@ -301,11 +469,25 @@ static int beagle_twl_gpio_setup(struct device *dev,
  	}
  	/* gpio + 0 is "mmc0_cd" (input/IRQ) */
  	mmc[0].gpio_cd = gpio + 0;
@@ -227,7 +227,7 @@ index 1eb1e8e..70ed6f3 100644
  
  	/* REVISIT: need ehci-omap hooks for external VBUS
  	 * power switch and overcurrent detect
-@@ -464,7 +646,7 @@ static struct twl4030_platform_data beagle_twldata = {
+@@ -466,7 +648,7 @@ static struct twl4030_platform_data beagle_twldata = {
  	.vpll2		= &beagle_vpll2,
  };
  
@@ -236,7 +236,7 @@ index 1eb1e8e..70ed6f3 100644
  	{
  		I2C_BOARD_INFO("twl4030", 0x48),
  		.flags = I2C_CLIENT_WAKE,
-@@ -479,10 +661,24 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = {
+@@ -481,10 +663,24 @@ static struct i2c_board_info __initdata beagle_i2c_eeprom[] = {
         },
  };
  
@@ -263,7 +263,7 @@ index 1eb1e8e..70ed6f3 100644
  	/* Bus 3 is attached to the DVI port where devices like the pico DLP
  	 * projector don't work reliably with 400kHz */
  	omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom));
-@@ -625,6 +821,15 @@ static struct omap_musb_board_data musb_board_data = {
+@@ -627,6 +823,15 @@ static struct omap_musb_board_data musb_board_data = {
  	.power			= 100,
  };
  
@@ -279,7 +279,7 @@ index 1eb1e8e..70ed6f3 100644
  static void __init beagle_opp_init(void)
  {
  	int r = 0;
-@@ -691,6 +896,65 @@ static void __init omap3_beagle_init(void)
+@@ -693,6 +898,65 @@ static void __init omap3_beagle_init(void)
  	/* REVISIT leave DVI powered down until it's needed ... */
  	gpio_direction_output(170, true);
  
@@ -345,7 +345,7 @@ index 1eb1e8e..70ed6f3 100644
  	usb_musb_init(&musb_board_data);
  	usbhs_init(&usbhs_bdata);
  	omap3beagle_flash_init();
-@@ -703,6 +967,8 @@ static void __init omap3_beagle_init(void)
+@@ -705,6 +969,8 @@ static void __init omap3_beagle_init(void)
  	beagle_opp_init();
  }
  
diff --git a/recipes-kernel/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch b/recipes-kernel/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch
index 80a47e68dc..0f5c0bd56c 100644
--- a/recipes-kernel/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch
+++ b/recipes-kernel/linux/linux-omap-2.6.39/beagle/0003-OMAP3-beagle-add-MADC-support.patch
@@ -1,7 +1,7 @@
-From cfa62e807901f04bfd0e9f38a283ac974ff3d888 Mon Sep 17 00:00:00 2001
+From b6deb9a9c3a0c8b9afc981cbca20ff73fa7a8d8c Mon Sep 17 00:00:00 2001
 From: Koen Kooi <koen@dominion.thruhere.net>
 Date: Sat, 21 May 2011 16:18:30 +0200
-Subject: [PATCH 3/3] OMAP3: beagle: add MADC support
+Subject: [PATCH 3/5] OMAP3: beagle: add MADC support
 
 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 70ed6f3..aa7849a 100644
+index db285e1..da4ba50 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -632,6 +632,10 @@ static struct twl4030_codec_data beagle_codec_data = {
+@@ -634,6 +634,10 @@ static struct twl4030_codec_data beagle_codec_data = {
  	.audio = &beagle_audio_data,
  };
  
@@ -23,7 +23,7 @@ index 70ed6f3..aa7849a 100644
  static struct twl4030_platform_data beagle_twldata = {
  	.irq_base	= TWL4030_IRQ_BASE,
  	.irq_end	= TWL4030_IRQ_END,
-@@ -640,6 +644,7 @@ static struct twl4030_platform_data beagle_twldata = {
+@@ -642,6 +646,7 @@ static struct twl4030_platform_data beagle_twldata = {
  	.usb		= &beagle_usb_data,
  	.gpio		= &beagle_gpio_data,
  	.codec		= &beagle_codec_data,
diff --git a/recipes-kernel/linux/linux-omap-2.6.39/beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch b/recipes-kernel/linux/linux-omap-2.6.39/beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch
new file mode 100644
index 0000000000..900502d2bb
--- /dev/null
+++ b/recipes-kernel/linux/linux-omap-2.6.39/beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch
@@ -0,0 +1,71 @@
+From 0ba8b335b9dd023784ef493b524d6335bfcd453a Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Wed, 25 May 2011 08:56:06 +0200
+Subject: [PATCH 4/5] OMAP3: beagle: add regulators for camera interface
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |   40 +++++++++++++++++++++++++++++++
+ 1 files changed, 40 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index da4ba50..52ea11a 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -453,6 +453,44 @@ static struct regulator_consumer_supply beagle_vsim_supply = {
+ 
+ static struct gpio_led gpio_leds[];
+ 
++static struct regulator_consumer_supply beagle_vaux3_supply = {
++	.supply		= "cam_1v8",
++};
++
++static struct regulator_consumer_supply beagle_vaux4_supply = {
++	.supply		= "cam_2v8",
++};
++
++/* VAUX3 for CAM_1V8 */
++static struct regulator_init_data beagle_vaux3 = {
++	.constraints = {
++		.min_uV			= 1800000,
++		.max_uV			= 1800000,
++		.apply_uV		= true,
++		.valid_modes_mask	= REGULATOR_MODE_NORMAL
++					| REGULATOR_MODE_STANDBY,
++		.valid_ops_mask		= REGULATOR_CHANGE_MODE
++					| REGULATOR_CHANGE_STATUS,
++	},
++	.num_consumer_supplies	= 1,
++	.consumer_supplies	= &beagle_vaux3_supply,
++};
++
++/* VAUX4 for CAM_2V8 */
++static struct regulator_init_data beagle_vaux4 = {
++	.constraints = {
++		.min_uV			= 1800000,
++		.max_uV			= 1800000,
++		.apply_uV		= true,
++		.valid_modes_mask	= REGULATOR_MODE_NORMAL
++					| REGULATOR_MODE_STANDBY,
++		.valid_ops_mask		= REGULATOR_CHANGE_MODE
++					| REGULATOR_CHANGE_STATUS,
++	},
++	.num_consumer_supplies	= 1,
++	.consumer_supplies	= &beagle_vaux4_supply,
++};
++
+ static int beagle_twl_gpio_setup(struct device *dev,
+ 		unsigned gpio, unsigned ngpio)
+ {
+@@ -651,6 +689,8 @@ static struct twl4030_platform_data beagle_twldata = {
+ 	.vsim		= &beagle_vsim,
+ 	.vdac		= &beagle_vdac,
+ 	.vpll2		= &beagle_vpll2,
++	.vaux3		= &beagle_vaux3,
++	.vaux4		= &beagle_vaux4,
+ };
+ 
+ static struct i2c_board_info __initdata beagle_i2c1_boardinfo[] = {
+-- 
+1.6.6.1
+
diff --git a/recipes-kernel/linux/linux-omap-2.6.39/beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch b/recipes-kernel/linux/linux-omap-2.6.39/beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch
new file mode 100644
index 0000000000..a555c9319b
--- /dev/null
+++ b/recipes-kernel/linux/linux-omap-2.6.39/beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch
@@ -0,0 +1,31 @@
+From 5b0f364b7e017d422b01c0e3297d0b68119f95f0 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Wed, 25 May 2011 08:57:40 +0200
+Subject: [PATCH 5/5] OMAP3: beagle: HACK! add in 1GHz OPP
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ arch/arm/mach-omap2/board-omap3beagle.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index 52ea11a..cf95173 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -901,11 +901,13 @@ static void __init beagle_opp_init(void)
+ 		/* Enable MPU 1GHz and lower opps */
+ 		dev = &mh->od->pdev.dev;
+ 		r = opp_enable(dev, 800000000);
++		r |= opp_enable(dev, 1000000000);
+ 		/* TODO: MPU 1GHz needs SR and ABB */
+ 
+ 		/* Enable IVA 800MHz and lower opps */
+ 		dev = &dh->od->pdev.dev;
+ 		r |= opp_enable(dev, 660000000);
++		r |= opp_enable(dev, 800000000);
+ 		/* TODO: DSP 800MHz needs SR and ABB */
+ 		if (r) {
+ 			pr_err("%s: failed to enable higher opp %d\n",
+-- 
+1.6.6.1
+
diff --git a/recipes-kernel/linux/linux-omap-2.6.39/beagleboard/defconfig b/recipes-kernel/linux/linux-omap-2.6.39/beagleboard/defconfig
index ad327cac89..e2502650e0 100644
--- a/recipes-kernel/linux/linux-omap-2.6.39/beagleboard/defconfig
+++ b/recipes-kernel/linux/linux-omap-2.6.39/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.39 Kernel Configuration
-# Mon May 23 13:05:03 2011
+# Wed May 25 09:25:56 2011
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -460,13 +460,13 @@ CONFIG_AUTO_ZRELADDR=y
 #
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_DEBUG=y
+# CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_HOTPLUG is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
@@ -2041,6 +2041,7 @@ CONFIG_VIDEO_ADV7180=m
 # CONFIG_VIDEO_BT866 is not set
 # CONFIG_VIDEO_KS0127 is not set
 CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9P031=m
 CONFIG_VIDEO_MT9V011=m
 # CONFIG_VIDEO_TCM825X is not set
 # CONFIG_VIDEO_SAA7110 is not set
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
new file mode 100644
index 0000000000..2d7ee7ae89
--- /dev/null
+++ b/recipes-kernel/linux/linux-omap-2.6.39/camera/0001-Add-mt9p031-sensor-support.patch
@@ -0,0 +1,917 @@
+From 69f7b0ee14f046e469d616611ee87836e04219b4 Mon Sep 17 00:00:00 2001
+From: Javier Martin <javier.martin@vista-silicon.com>
+Date: Tue, 24 May 2011 16:30:43 +0200
+Subject: [PATCH] Add mt9p031 sensor support.
+
+This RFC includes a power management implementation that causes
+the sensor to show images with horizontal artifacts (usually
+monochrome lines that appear on the image randomly).
+
+Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ 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..8a596cc 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..04d8812
+--- /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..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.bb b/recipes-kernel/linux/linux-omap_2.6.39.bb
index 94899fae30..db11bf9111 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 = "c"
+MACHINE_KERNEL_PR_append = "d"
 
 FILESPATHPKG_prepend = "linux-omap-2.6.39:"
 
@@ -49,6 +49,10 @@ SRC_URI_append = " \
            file://beagle/0001-OMAP3-beagle-add-support-for-beagleboard-xM-revision.patch \
            file://beagle/0002-OMAP3-beagle-add-support-for-expansionboards.patch \
            file://beagle/0003-OMAP3-beagle-add-MADC-support.patch \
+           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-support.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 \