[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-356-g53d6047
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-356-g53d6047
|
From: Julien B a. A. <ar...@us...> - 2010-05-19 16:03:32
|
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 53d60476b9fd0481ffd82bef2eac1c61bd5f94db (commit)
via 7b8fc12e38fe32f98e7dd1faf2499f1938d48d29 (commit)
from 189e5720d117e7f9f2d890653d77aca69345d096 (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 53d60476b9fd0481ffd82bef2eac1c61bd5f94db
Author: Julien Boibessot <jul...@ar...>
Date: Wed May 19 18:02:27 2010 +0200
[LINUX] ov7670: add possibility to read registers through /proc in DEBUG mode
commit 7b8fc12e38fe32f98e7dd1faf2499f1938d48d29
Author: Julien Boibessot <jul...@ar...>
Date: Wed May 19 17:58:06 2010 +0200
[LINUX] Improve error message when failing to allocate a GPIO
-----------------------------------------------------------------------
Summary of changes:
.../319-apf27-armadeus-ov96xx_sensors_driver.patch | 22 ++++----
...isplay_gpio_number_when_reservation_fails.patch | 11 ++--
...adeus-soc_camera-add_ov7670_sensor_driver.patch | 64 +++++++++++++++----
3 files changed, 67 insertions(+), 30 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch
index b373abe..e2e612a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch
@@ -4,10 +4,10 @@ Based on work from Trilok Soni <son...@gm...> on ov9640 driver for OMAP
Signed-off-by: Julien boibessot <jul...@ar...>
-Index: linux-2.6.29/drivers/media/video/Kconfig
+Index: linux-2.6.29.6/drivers/media/video/Kconfig
===================================================================
---- linux-2.6.29.orig/drivers/media/video/Kconfig 2009-05-25 14:20:25.000000000 +0200
-+++ linux-2.6.29/drivers/media/video/Kconfig 2009-05-25 14:20:25.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-05-19 17:05:55.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-05-19 17:48:31.000000000 +0200
@@ -298,6 +298,13 @@
OV7670 VGA camera. It currently only works with the M88ALP01
controller.
@@ -22,10 +22,10 @@ Index: linux-2.6.29/drivers/media/video/Kconfig
config VIDEO_TCM825X
tristate "TCM825x camera sensor support"
depends on I2C && VIDEO_V4L2
-Index: linux-2.6.29/drivers/media/video/Makefile
+Index: linux-2.6.29.6/drivers/media/video/Makefile
===================================================================
---- linux-2.6.29.orig/drivers/media/video/Makefile 2009-05-25 14:20:25.000000000 +0200
-+++ linux-2.6.29/drivers/media/video/Makefile 2009-05-25 14:20:25.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-05-19 17:05:55.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Makefile 2010-05-19 17:48:31.000000000 +0200
@@ -106,6 +106,7 @@
obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
@@ -34,10 +34,10 @@ Index: linux-2.6.29/drivers/media/video/Makefile
obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
-Index: linux-2.6.29/drivers/media/video/ov96xx.c
+Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29/drivers/media/video/ov96xx.c 2009-05-25 14:21:42.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/ov96xx.c 2010-05-19 17:05:55.000000000 +0200
@@ -0,0 +1,1785 @@
+/*
+ * drivers/media/video/ov96xx.c
@@ -1647,8 +1647,8 @@ Index: linux-2.6.29/drivers/media/video/ov96xx.c
+ goto err;
+
+ /* create proc files */
-+ proc_read = create_proc_entry( "driver/ovread", S_IWUSR | S_IRGRP | S_IROTH, NULL);
-+ proc_write = create_proc_entry( "driver/ovwrite", S_IWUSR | S_IRGRP | S_IROTH, NULL);
++ proc_read = create_proc_entry("driver/ovread", S_IWUSR | S_IRGRP | S_IROTH, NULL);
++ proc_write = create_proc_entry("driver/ovwrite", S_IWUSR | S_IRGRP | S_IROTH, NULL);
+ if ((proc_read == NULL) || (proc_write == NULL)) {
+ printk(KERN_ERR DRIVER_NAME ": Could not register one /proc file. Terminating\n");
+ return -ENOMEM;
@@ -1762,7 +1762,7 @@ Index: linux-2.6.29/drivers/media/video/ov96xx.c
+ goto err;
+
+ return 0;
-+
++
+/* err = v4l2_int_device_register(sensor->v4l2_int_device);
+ if (err)
+ i2c_set_clientdata(client, NULL);*/
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
index 8e30ef2..203fa10 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
@@ -4,14 +4,15 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.29.6/arch/arm/plat-mxc/iomux-mx1-mx2.c
===================================================================
---- linux-2.6.29.6.orig/arch/arm/plat-mxc/iomux-mx1-mx2.c 2009-12-17 10:04:43.000000000 +0100
-+++ linux-2.6.29.6/arch/arm/plat-mxc/iomux-mx1-mx2.c 2009-12-17 10:49:56.000000000 +0100
-@@ -136,6 +136,8 @@
+--- linux-2.6.29.6.orig/arch/arm/plat-mxc/iomux-mx1-mx2.c 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.6/arch/arm/plat-mxc/iomux-mx1-mx2.c 2010-05-19 10:46:15.000000000 +0200
+@@ -136,6 +136,9 @@
return 0;
setup_error:
-+ printk("*** Failed to reserve GPIO %d (port %d pin %d)\n", gpio,
-+ gpio & GPIO_PORT_MASK, gpio & GPIO_PIN_MASK);
++ printk("*** Failed to reserve GPIO %d (port %c pin %d)\n", gpio,
++ 0x41 + ((gpio & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT),
++ gpio & GPIO_PIN_MASK);
mxc_gpio_release_multiple_pins(pin_list, i);
return ret;
}
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 399d02b..7ce8588 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-05-18 15:32:00.000000000 +0200
-@@ -0,0 +1,1571 @@
++++ linux-2.6.29.6/drivers/media/video/ov7670_soc.c 2010-05-19 17:54:35.000000000 +0200
+@@ -0,0 +1,1607 @@
+/*
+ * A V4L2 driver for OmniVision OV7670 cameras.
+ *
@@ -33,7 +33,9 @@ Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
+#include <media/v4l2-chip-ident.h>
+#include <linux/i2c.h>
+#include <media/soc_camera.h>
-+
++#ifdef DEBUG
++#include <linux/proc_fs.h>
++#endif
+
+MODULE_AUTHOR("Jonathan Corbet <co...@lw...>, Julien Boibessot <jul...@ar...>");
+MODULE_DESCRIPTION("SoC camera driver for OmniVision ov7670 sensors");
@@ -1398,13 +1400,47 @@ Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
+ return 0;
+}
+
++static int
++ov7670_proc_read_register( __attribute__ ((unused)) struct file *file,
++ const char *buf, unsigned long count,
++ void *data)
++{
++ int len;
++ char given_param[16];
++ u8 reg_addr;
++ u8 reg_val;
++ struct i2c_client *i2c_client = data;
++
++ if (count <= 0) {
++ printk("Empty string transmitted !\n");
++ return 0;
++ }
++ if (count > 4) {
++ len = 4;
++ printk("Only 4x[0-9] decimal values supported !\n");
++ } else {
++ len = count;
++ }
++
++ if (copy_from_user(given_param, buf, len)) {
++ return -EFAULT;
++ }
++
++ reg_addr = (u8)(simple_strtol(given_param, 0, 16));
++ /*current_reg_addr = reg_addr;*/
++ ov7670_read(i2c_client, reg_addr, ®_val);
++ printk("Read 0x%02x @ 0x%02x\n", reg_val, reg_addr);
++
++ return len;
++}
++
+/* Interface active, can use i2c. If it fails, it can indeed mean, that
+ * this wasn't our capture interface, so, we wait for the right one */
+static int ov7670_video_probe(struct soc_camera_device *icd)
+{
+ struct ov7670 *ov7670 = container_of(icd, struct ov7670, icd);
+#ifdef DEBUG
-+ struct proc_dir_entry *proc_read, *proc_write;
++ struct proc_dir_entry *proc_read/*, *proc_write*/;
+#endif
+ struct i2c_client *client = ov7670->i2c_client;
+ int ret;
@@ -1422,16 +1458,16 @@ Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
+
+#ifdef DEBUG
+ /* create proc files */
-+ proc_read = create_proc_entry( "driver/ovread", S_IWUSR | S_IRGRP | S_IROTH, NULL);
-+ proc_write = create_proc_entry( "driver/ovwrite", S_IWUSR | S_IRGRP | S_IROTH, NULL);
-+ if ((proc_read == NULL) || (proc_write == NULL)) {
++ proc_read = create_proc_entry("driver/ovread", S_IWUSR | S_IRGRP | S_IROTH, NULL);
++ /*proc_write = create_proc_entry("driver/ovwrite", S_IWUSR | S_IRGRP | S_IROTH, NULL);*/
++ if ((proc_read == NULL) /*|| (proc_write == NULL)*/) {
+ printk(KERN_ERR DRIVER_NAME ": Could not register one /proc file. Terminating\n");
+ return -ENOMEM;
+ } else {
+ proc_read->write_proc = ov7670_proc_read_register;
+ proc_read->data = client;
-+ proc_write->write_proc = ov7670_proc_write_register;
-+ proc_write->data = client;
++ /*proc_write->write_proc = ov7670_proc_write_register;
++ proc_write->data = client;*/
+ }
+#endif
+
@@ -1536,7 +1572,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
+ return -ENODEV; /* our client isn't attached */
+#ifdef DEBUG
+ remove_proc_entry("driver/ovread", NULL);
-+ remove_proc_entry("driver/ovwrite", NULL);
++ /*remove_proc_entry("driver/ovwrite", NULL);*/
+#endif
+ soc_camera_device_unregister(&ov7670->icd);
+ i2c_set_clientdata(client, NULL);
@@ -1581,8 +1617,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-05-17 15:25:43.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-05-17 15:25:46.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-05-19 17:48:31.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-05-19 17:48:46.000000000 +0200
@@ -796,6 +796,12 @@
help
This is a ov772x camera driver
@@ -1598,8 +1634,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-05-17 15:25:43.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Makefile 2010-05-17 15:25:46.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-05-19 17:48:31.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Makefile 2010-05-19 17:48: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
|
