[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-353-gaea3f44
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-353-gaea3f44
|
From: Julien B a. A. <ar...@us...> - 2010-05-18 14:10:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via aea3f44ce82c03084f84f05c76a84d5fcadaac71 (commit)
from cce816f35d8a757d2d33f90b1a04379199cc9bbb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit aea3f44ce82c03084f84f05c76a84d5fcadaac71
Author: Julien Boibessot <jul...@ar...>
Date: Tue May 18 16:09:19 2010 +0200
[LINUX] ov7670: change init/detect sequence
-----------------------------------------------------------------------
Summary of changes:
...adeus-soc_camera-add_ov7670_sensor_driver.patch | 25 ++++++++++++-------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch
index 3909d7a..399d02b 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch
@@ -6,8 +6,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ov7670_soc.c 2010-04-22 11:05:56.000000000 +0200
-@@ -0,0 +1,1564 @@
++++ linux-2.6.29.6/drivers/media/video/ov7670_soc.c 2010-05-18 15:32:00.000000000 +0200
+@@ -0,0 +1,1571 @@
+/*
+ * A V4L2 driver for OmniVision OV7670 cameras.
+ *
@@ -516,15 +516,16 @@ Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
+static int ov7670_initialize(struct i2c_client *client)
+{
+ dev_info(&client->dev, "initializing\n");
++
+ return ov7670_write_array(client, ov7670_default_regs);
+}
+
+static int ov7670_init(struct soc_camera_device *icd)
+{
-+ struct ov7670 *ov7670 = container_of(icd, struct ov7670, icd);
-+ struct i2c_client *client = ov7670->i2c_client;
++/* struct ov7670 *ov7670 = container_of(icd, struct ov7670, icd);
++ struct i2c_client *client = ov7670->i2c_client; */
+
-+ return ov7670_initialize(client);
++ return 0; /*ov7670_initialize(client);*/
+}
+
+static int ov7670_release(struct soc_camera_device *icd)
@@ -580,6 +581,8 @@ Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
+ if (ret < 0)
+ return ret;
+#endif
++ ov7670_read(client, REG_MIDH, &v); /* first access after a reset
++ might fail */
+ ret = ov7670_read(client, REG_MIDH, &v);
+ if (ret < 0)
+ return ret;
@@ -604,6 +607,10 @@ Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
+ if (v != 0x73) /* PID + VER = 0x76 / 0x73 */
+ return -ENODEV;
+
++ ret = ov7670_initialize(client);
++ if (ret < 0)
++ return ret;
++
+ return 0;
+}
+
@@ -1574,8 +1581,8 @@ Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
+module_exit(ov7670_mod_exit);
Index: linux-2.6.29.6/drivers/media/video/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-04-22 11:04:40.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-04-22 11:09:32.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-05-17 15:25:43.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-05-17 15:25:46.000000000 +0200
@@ -796,6 +796,12 @@
help
This is a ov772x camera driver
@@ -1591,8 +1598,8 @@ Index: linux-2.6.29.6/drivers/media/video/Kconfig
depends on VIDEO_DEV && PXA27x && SOC_CAMERA
Index: linux-2.6.29.6/drivers/media/video/Makefile
===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-04-22 11:04:45.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Makefile 2010-04-22 11:12:21.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-05-17 15:25:43.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Makefile 2010-05-17 15:25:46.000000000 +0200
@@ -145,6 +145,7 @@
obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o
obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o
hooks/post-receive
--
armadeus
|
