[oe-commits] Jason Kridner : linux-omap-psp_2.6.32: Move camera sensor reset

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 7058b8b5dda8a6ce31e79c5253bb38789077c3ef
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7058b8b5dda8a6ce31e79c5253bb38789077c3ef

Author: Jason Kridner <jkridner at beagleboard.org>
Date:   Thu Aug  5 09:21:22 2010 +0000

linux-omap-psp_2.6.32: Move camera sensor reset

Camera reset needed to be done after applying power.

Signed-off-by: Jason Kridner <jkridner at beagleboard.org>
Signed-off-by: Koen Kooi <koen at beagleboard.org>

---

 conf/machine/include/omap3.inc                     |    2 +-
 ...-Move-sensor-rest-to-after-applying-power.patch |   65 ++++++++++++++++++++
 recipes/linux/linux-omap-psp_2.6.32.bb             |    1 +
 3 files changed, 67 insertions(+), 1 deletions(-)

diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 7c30288..0b8e42e 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = "omap3"
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r86"
+MACHINE_KERNEL_PR = "r87"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/recipes/linux/linux-omap-psp-2.6.32/cam/0001-Move-sensor-rest-to-after-applying-power.patch b/recipes/linux/linux-omap-psp-2.6.32/cam/0001-Move-sensor-rest-to-after-applying-power.patch
new file mode 100644
index 0000000..4bb327e
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.32/cam/0001-Move-sensor-rest-to-after-applying-power.patch
@@ -0,0 +1,65 @@
+From f3fdd3fb4e45b75722d68e5e380c0c71f83fffcf Mon Sep 17 00:00:00 2001
+From: Steve Kipisz <s-kipisz2 at ti.com>
+Date: Thu, 5 Aug 2010 10:51:11 -0500
+Subject: [PATCH] Move sensor rest to after applying power.
+
+---
+ arch/arm/mach-omap2/board-omap3beagle-camera.c |   12 ++++++++----
+ 1 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c
+index 520e1d8..39ac4b7 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle-camera.c
++++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c
+@@ -160,8 +160,6 @@ static int mt9v113_power_set(struct v4l2_int_device *s, enum v4l2_power power)
+ 	case V4L2_POWER_ON:
+ 
+ 		isp_configure_interface(vdev->cam->isp, &mt9v113_if_config);
+-		/* Set RESET_BAR to 0 */
+-		gpio_set_value(LEOPARD_RESET_GPIO, 0);
+ 
+ 		/* turn on VDD */
+ 		regulator_enable(cam_1v8_reg);
+@@ -170,6 +168,9 @@ static int mt9v113_power_set(struct v4l2_int_device *s, enum v4l2_power power)
+ 		regulator_enable(cam_2v8_reg);
+ 		mdelay(50);
+ 
++		/* Set RESET_BAR to 0 */
++		gpio_set_value(LEOPARD_RESET_GPIO, 0);
++
+ 		/* Enable EXTCLK */
+ 		isp_set_xclk(vdev->cam->isp, MT9V113_CLK_MIN*2, CAM_USE_XCLKA);
+ 		/*
+@@ -177,8 +178,10 @@ static int mt9v113_power_set(struct v4l2_int_device *s, enum v4l2_power power)
+ 		 * ((1000000 * 70) / 6000000) = aprox 12 us.
+ 		 */
+ 		udelay(12);
++
+ 		/* Set RESET_BAR to 1 */
+ 		gpio_set_value(LEOPARD_RESET_GPIO, 1);
++
+ 		/*
+ 		 * Wait at least 100 CLK cycles (w/EXTCLK = 6MHz, or CLK_MIN):
+ 		 * ((1000000 * 100) / 6000000) = aprox 17 us.
+@@ -317,8 +320,6 @@ static int mt9t112_power_set(struct v4l2_int_device *s, enum v4l2_power power)
+ 		isp_configure_interface(vdev->cam->isp, &mt9t112_if_config);
+ #endif
+ 
+-		/* Set RESET_BAR to 0 */
+-		gpio_set_value(LEOPARD_RESET_GPIO, 0);
+ 
+ 		/* turn on VDD */
+ 		regulator_enable(cam_1v8_reg);
+@@ -330,6 +331,9 @@ static int mt9t112_power_set(struct v4l2_int_device *s, enum v4l2_power power)
+ 
+ 		mdelay(50);
+ 
++		/* Set RESET_BAR to 0 */
++		gpio_set_value(LEOPARD_RESET_GPIO, 0);
++
+ 		/* Enable EXTCLK */
+ 		isp_set_xclk(vdev->cam->isp, 24000000, CAM_USE_XCLKA);
+ 
+-- 
+1.6.6.1
+
diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb
index 5c1287b..887e3d5 100644
--- a/recipes/linux/linux-omap-psp_2.6.32.bb
+++ b/recipes/linux/linux-omap-psp_2.6.32.bb
@@ -130,6 +130,7 @@ SRC_URI = "git://arago-project.org/git/people/sriram/ti-psp-omap.git;protocol=gi
            file://cam/0071-mt9t112-Trigger-autofocus-at-the-end-of-context-swit.patch \
            file://cam/0002-omap3beagle-camera-Fix-dual-sensor-registration.patch \
            file://cam/0003-mt9v113-Fix-State-variable-handling.patch \
+	   file://cam/0001-Move-sensor-rest-to-after-applying-power.patch \
            file://0001-BeagleBoard-Adjust-USER-button-pin-for-xM.patch \
            file://defconfig"