[Armadeus-commitlog] SF.net SVN: armadeus:[1299] trunk/buildroot/target/device/armadeus/linux/ kern
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1299] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.29
|
From: <ar...@us...> - 2009-05-25 13:22:33
|
Revision: 1299
http://armadeus.svn.sourceforge.net/armadeus/?rev=1299&view=rev
Author: artemys
Date: 2009-05-25 12:45:42 +0000 (Mon, 25 May 2009)
Log Message:
-----------
[LINUX] Updates apf27 patches for 2.6.29
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/226-apf27-pengu-mx27-Camera_support.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/226-apf27-pengu-mx27-Camera_support.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/226-apf27-pengu-mx27-Camera_support.patch 2009-05-22 17:07:00 UTC (rev 1298)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/226-apf27-pengu-mx27-Camera_support.patch 2009-05-25 12:45:42 UTC (rev 1299)
@@ -19,15 +19,16 @@
- fix direction of pixel clock
20081103:
- implement setting of packing direction from platform
+20090525:
+- JB: update for 2.6.29
Signed-off-by: Sascha Hauer <s....@pe...>
---
-diff --git a/arch/arm/plat-mxc/include/mach/imx_cam.h b/arch/arm/plat-mxc/include/mach/imx_cam.h
-new file mode 100644
-index 0000000..2d704ae
---- /dev/null
-+++ b/arch/arm/plat-mxc/include/mach/imx_cam.h
+Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imx_cam.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imx_cam.h 2009-05-25 13:47:04.000000000 +0200
@@ -0,0 +1,47 @@
+/*
+ imx-cam.h - i.MX27 camera driver header file
@@ -76,11 +77,11 @@
+
+#endif /* __ASM_ARCH_CAMERA_H_ */
+
-diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
-index 47102c2..645d805 100644
---- a/drivers/media/video/Kconfig
-+++ b/drivers/media/video/Kconfig
-@@ -893,4 +893,12 @@ config USB_S2255
+Index: linux-2.6.29/drivers/media/video/Kconfig
+===================================================================
+--- linux-2.6.29.orig/drivers/media/video/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29/drivers/media/video/Kconfig 2009-05-25 14:20:12.000000000 +0200
+@@ -929,4 +929,12 @@
endif # V4L_USB_DRIVERS
@@ -93,24 +94,23 @@
+ This is a v4l2 driver for the i.MX27 Capture Interface
+
endif # VIDEO_CAPTURE_DRIVERS
-diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
-index 16962f3..5f59ea9 100644
---- a/drivers/media/video/Makefile
-+++ b/drivers/media/video/Makefile
-@@ -128,6 +128,7 @@ obj-$(CONFIG_VIDEO_VIVI) += vivi.o
+Index: linux-2.6.29/drivers/media/video/Makefile
+===================================================================
+--- linux-2.6.29.orig/drivers/media/video/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29/drivers/media/video/Makefile 2009-05-25 14:20:12.000000000 +0200
+@@ -135,6 +135,7 @@
obj-$(CONFIG_VIDEO_CX23885) += cx23885/
obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
+obj-$(CONFIG_VIDEO_MX27) += mx27_camera.o
obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o
+ obj-$(CONFIG_VIDEO_OMAP2) += omap2cam.o
obj-$(CONFIG_SOC_CAMERA) += soc_camera.o
- obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o
-diff --git a/drivers/media/video/mx27_camera.c b/drivers/media/video/mx27_camera.c
-new file mode 100644
-index 0000000..b61dec1
---- /dev/null
-+++ b/drivers/media/video/mx27_camera.c
-@@ -0,0 +1,1185 @@
+Index: linux-2.6.29/drivers/media/video/mx27_camera.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29/drivers/media/video/mx27_camera.c 2009-05-25 14:19:49.000000000 +0200
+@@ -0,0 +1,1187 @@
+/*
+ * V4L2 Driver for MX27 camera host
+ *
@@ -808,6 +808,7 @@
+ return 0;
+}
+
++/* DEPRECATED
+static int mx27_camera_try_bus_param(struct soc_camera_device *icd,
+ __u32 pixfmt)
+{
@@ -820,11 +821,12 @@
+ return soc_camera_bus_param_compatible(camera_flags, bus_flags) ?
+ 0 : -EINVAL;
+}
++*/
+
+static int mx27_camera_set_fmt_cap(struct soc_camera_device *icd,
+ __u32 pixfmt, struct v4l2_rect *rect)
+{
-+ return icd->ops->set_fmt_cap(icd, pixfmt, rect);
++ return icd->ops->set_fmt(icd, pixfmt, rect);
+}
+
+static int mx27_camera_try_fmt_cap(struct soc_camera_device *icd,
@@ -950,13 +952,13 @@
+ .owner = THIS_MODULE,
+ .add = mx27_camera_add_device,
+ .remove = mx27_camera_remove_device,
-+ .set_fmt_cap = mx27_camera_set_fmt_cap,
-+ .try_fmt_cap = mx27_camera_try_fmt_cap,
++ .set_fmt = mx27_camera_set_fmt_cap,
++ .try_fmt = mx27_camera_try_fmt_cap,
+ .init_videobuf = mx27_camera_init_videobuf,
+ .reqbufs = mx27_camera_reqbufs,
+ .poll = mx27_camera_poll,
+ .querycap = mx27_camera_querycap,
-+ .try_bus_param = mx27_camera_try_bus_param,
++/* .try_bus_param = mx27_camera_try_bus_param, */
+ .set_bus_param = mx27_camera_set_bus_param,
+};
+
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch 2009-05-22 17:07:00 UTC (rev 1298)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch 2009-05-25 12:45:42 UTC (rev 1299)
@@ -4,7 +4,7 @@
Index: linux-2.6.29/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29/arch/arm/mach-mx2/apf27.c 2009-04-14 17:57:01.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-mx2/apf27.c 2009-05-25 14:12:14.000000000 +0200
@@ -0,0 +1,1560 @@
+ /*
+ * apf27.c
@@ -1452,7 +1452,7 @@
+{
+ int res;
+
-+ res = mxc_gpio_setup_multiple(fpga_pins, ARRAY_SIZE(fpga_pins), "FPGA");
++ res = mxc_gpio_setup_multiple_pins(fpga_pins, ARRAY_SIZE(fpga_pins), "FPGA");
+ if (!res)
+ set_irq_type(APF27_FPGA_IRQ, IRQF_TRIGGER_RISING);
+
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch 2009-05-22 17:07:00 UTC (rev 1298)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch 2009-05-25 12:45:42 UTC (rev 1299)
@@ -4,11 +4,11 @@
Signed-off-by: Julien boibessot <jul...@ar...>
-Index: linux-2.6.27.13/drivers/media/video/Kconfig
+Index: linux-2.6.29/drivers/media/video/Kconfig
===================================================================
---- linux-2.6.27.13.orig/drivers/media/video/Kconfig 2009-03-23 14:43:41.000000000 +0100
-+++ linux-2.6.27.13/drivers/media/video/Kconfig 2009-03-23 14:52:38.000000000 +0100
-@@ -288,6 +288,13 @@
+--- 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
+@@ -298,6 +298,13 @@
OV7670 VGA camera. It currently only works with the M88ALP01
controller.
@@ -22,11 +22,11 @@
config VIDEO_TCM825X
tristate "TCM825x camera sensor support"
depends on I2C && VIDEO_V4L2
-Index: linux-2.6.27.13/drivers/media/video/Makefile
+Index: linux-2.6.29/drivers/media/video/Makefile
===================================================================
---- linux-2.6.27.13.orig/drivers/media/video/Makefile 2009-03-23 14:53:18.000000000 +0100
-+++ linux-2.6.27.13/drivers/media/video/Makefile 2009-03-23 14:54:01.000000000 +0100
-@@ -105,6 +105,7 @@
+--- 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
+@@ -106,6 +106,7 @@
obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
obj-$(CONFIG_VIDEO_OV7670) += ov7670.o
@@ -34,10 +34,10 @@
obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
-Index: linux-2.6.27.13/drivers/media/video/ov96xx.c
+Index: linux-2.6.29/drivers/media/video/ov96xx.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.27.13/drivers/media/video/ov96xx.c 2009-03-26 19:39:07.000000000 +0100
++++ linux-2.6.29/drivers/media/video/ov96xx.c 2009-05-25 14:21:42.000000000 +0200
@@ -0,0 +1,1785 @@
+/*
+ * drivers/media/video/ov96xx.c
@@ -1208,7 +1208,7 @@
+}
+
+static int ov96xx_get_chip_id(struct soc_camera_device *icd,
-+ struct v4l2_chip_ident *id)
++ struct v4l2_chip_ident_old *id)
+{
+/* struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
+
@@ -1687,8 +1687,8 @@
+ .release = ov96xx_release,
+ .start_capture = ov96xx_start_capture,
+ .stop_capture = ov96xx_stop_capture,
-+ .set_fmt_cap = ov96xx_set_fmt_cap,
-+ .try_fmt_cap = ov96xx_try_fmt_cap,
++ .set_fmt = ov96xx_set_fmt_cap,
++ .try_fmt = ov96xx_try_fmt_cap,
+ .set_bus_param = ov96xx_set_bus_param,
+ .query_bus_param = ov96xx_query_bus_param,
+ .controls = ov96xx_controls,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
