[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-174-ga82afb1
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-174-ga82afb1
|
From: Gwenhael <gwe...@us...> - 2010-12-18 08:54:26
|
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 a82afb1dd6619624a8ad120f3ea601f02ad58676 (commit)
via c3c3e221430b98e6ff34d98e6dbb72cfd08ffd3a (commit)
via 8c4c9fd0938d05522c08368674d650fc376384f2 (commit)
via 4f15b5166c14545e74ca1961cf27cfadc08b3c23 (commit)
from ff5bb7ff3b94909a3c7a89884618042420f9cff2 (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 a82afb1dd6619624a8ad120f3ea601f02ad58676
Merge: c3c3e221430b98e6ff34d98e6dbb72cfd08ffd3a ff5bb7ff3b94909a3c7a89884618042420f9cff2
Author: gwenhael <gw...@tr...>
Date: Sat Dec 18 09:57:02 2010 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c3c3e221430b98e6ff34d98e6dbb72cfd08ffd3a
Author: gwenhael <gw...@tr...>
Date: Sat Dec 18 09:56:16 2010 +0100
[LINUX] 2.6.36: adapt patch 074-armadeus-tsc2102-touchscreen.patch from 2.6.29
commit 8c4c9fd0938d05522c08368674d650fc376384f2
Author: gwenhael <gw...@tr...>
Date: Sat Dec 18 09:55:14 2010 +0100
[LINUX] 2.6.36: imx_udc: allows to get usb clock
commit 4f15b5166c14545e74ca1961cf27cfadc08b3c23
Author: gwenhael <gw...@tr...>
Date: Sat Dec 18 09:52:34 2010 +0100
[LINUX] 2.6.36: import patches 037, 038, 063, 073, 074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch from 2.6.29
-----------------------------------------------------------------------
Summary of changes:
.../030-armadeus-imx_udc-change_clk_get.patch | 12 +++++++++
...7-armadeus-imx_udc-add_printk_when_probed.patch | 8 +++---
...s-imx_udc-prevent_crash_after_soft_reboot.patch | 10 +++---
.../063-armadeus-max1027-add_max1027_include.patch | 8 +++---
.../{2.6.29 => 2.6.36}/073-armadeus-tsc2102.patch | 13 +++------
...02_integrate_driver_to_linux_build_system.patch | 27 ++++++++++++++++++++
...chscreen-add_driver_to_linux_build_system.patch | 12 ++++----
.../074-armadeus-tsc2102-touchscreen.patch | 15 ++++++-----
8 files changed, 71 insertions(+), 34 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx_udc-change_clk_get.patch
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/037-armadeus-imx_udc-add_printk_when_probed.patch (66%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch (70%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/063-armadeus-max1027-add_max1027_include.patch (91%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/073-armadeus-tsc2102.patch (98%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (71%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.27.13 => 2.6.36}/074-armadeus-tsc2102-touchscreen.patch (88%)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx_udc-change_clk_get.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx_udc-change_clk_get.patch
new file mode 100644
index 0000000..7d63721
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx_udc-change_clk_get.patch
@@ -0,0 +1,12 @@
+The usb clock is now register with device name.
+--- a/drivers/usb/gadget/imx_udc.c 2010-10-20 22:30:22.000000000 +0200
++++ b/drivers/usb/gadget/imx_udc.c 2010-12-05 11:19:47.000000000 +0100
+@@ -1438,7 +1438,7 @@
+ goto fail1;
+ }
+
+- clk = clk_get(NULL, "usbd_clk");
++ clk = clk_get(&pdev->dev, NULL);
+ if (IS_ERR(clk)) {
+ ret = PTR_ERR(clk);
+ dev_err(&pdev->dev, "can't get USB clock\n");
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/037-armadeus-imx_udc-add_printk_when_probed.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/037-armadeus-imx_udc-add_printk_when_probed.patch
similarity index 66%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/037-armadeus-imx_udc-add_printk_when_probed.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/037-armadeus-imx_udc-add_printk_when_probed.patch
index 27d6f52..419b742 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/037-armadeus-imx_udc-add_printk_when_probed.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/037-armadeus-imx_udc-add_printk_when_probed.patch
@@ -2,11 +2,11 @@ Needed by Armadeus UDC test to know if driver is up or not.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29/drivers/usb/gadget/imx_udc.c
+Index: linux-2.6.36/drivers/usb/gadget/imx_udc.c
===================================================================
---- linux-2.6.29.orig/drivers/usb/gadget/imx_udc.c 2009-05-18 16:42:45.000000000 +0200
-+++ linux-2.6.29/drivers/usb/gadget/imx_udc.c 2009-05-18 16:42:51.000000000 +0200
-@@ -1486,6 +1486,7 @@
+--- linux-2.6.36.orig/drivers/usb/gadget/imx_udc.c 2009-05-18 16:42:45.000000000 +0200
++++ linux-2.6.36/drivers/usb/gadget/imx_udc.c 2009-05-18 16:42:51.000000000 +0200
+@@ -1498,6 +1498,7 @@
imx_usb->timer.function = handle_config;
imx_usb->timer.data = (unsigned long)imx_usb;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
similarity index 70%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
index 4ea125b..4ef6bcf 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch
@@ -5,11 +5,11 @@ So this patch moves imx_usb->base definition at the right place.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29.4/drivers/usb/gadget/imx_udc.c
+Index: linux-2.6.36/drivers/usb/gadget/imx_udc.c
===================================================================
---- linux-2.6.29.4.orig/drivers/usb/gadget/imx_udc.c 2009-06-26 21:31:29.000000000 +0200
-+++ linux-2.6.29.4/drivers/usb/gadget/imx_udc.c 2009-06-26 21:32:24.000000000 +0200
-@@ -1455,6 +1455,7 @@
+--- linux-2.6.36.orig/drivers/usb/gadget/imx_udc.c 2009-06-26 21:31:29.000000000 +0200
++++ linux-2.6.36/drivers/usb/gadget/imx_udc.c 2009-06-26 21:32:24.000000000 +0200
+@@ -1467,6 +1467,7 @@
}
}
@@ -17,7 +17,7 @@ Index: linux-2.6.29.4/drivers/usb/gadget/imx_udc.c
for (i = 0; i < IMX_USB_NB_EP + 1; i++) {
ret = request_irq(imx_usb->usbd_int[i], intr_handler(i),
IRQF_DISABLED, driver_name, imx_usb);
-@@ -1468,7 +1469,6 @@
+@@ -1480,7 +1481,6 @@
}
imx_usb->res = res;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/063-armadeus-max1027-add_max1027_include.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/063-armadeus-max1027-add_max1027_include.patch
similarity index 91%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/063-armadeus-max1027-add_max1027_include.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/063-armadeus-max1027-add_max1027_include.patch
index 8597057..9dafb8a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/063-armadeus-max1027-add_max1027_include.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/063-armadeus-max1027-add_max1027_include.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.29.6/include/linux/spi/max1027.h
+Index: linux-2.6.36/include/linux/spi/max1027.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/linux/spi/max1027.h 2010-03-11 16:42:01.000000000 +0100
+--- /dev/null 2010-11-28 19:42:11.148000001 +0100
++++ b/include/linux/spi/max1027.h 2010-12-18 09:13:38.000000000 +0100
@@ -0,0 +1,71 @@
+/*
+ * include/linux/spi/max1027.h
@@ -67,7 +67,7 @@ Index: linux-2.6.29.6/include/linux/spi/max1027.h
+ u8 conv; /* initial conversion register value*/
+ u8 setup; /* initial setup register value */
+ u8 avg; /* initial average register value */
-+ int cnvst_pin; /*gpio to start conversion. -1 for software start */
++ int cnvst_pin; /*gpio to start conversion. -1 for software start */
+ int (*init)(struct spi_device *spi);
+ int (*exit)(struct spi_device *spi);
+};
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/073-armadeus-tsc2102.patch
similarity index 98%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/073-armadeus-tsc2102.patch
index 9c15479..99c1745 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/073-armadeus-tsc2102.patch
@@ -1,10 +1,7 @@
-PATCH AUTOMATICALLY GENERATED
-DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
-(Take a look at armadeus/target/linux/ directory to know how to generate it)
-Index: linux-2.6.29.6/include/linux/spi/tsc2102.h
+Index: linux-2.6.36/include/linux/spi/tsc2102.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/linux/spi/tsc2102.h 2010-05-31 11:02:34.000000000 +0200
++++ linux-2.6.36/include/linux/spi/tsc2102.h 2010-05-31 11:02:34.000000000 +0200
@@ -0,0 +1,306 @@
+/*
+ * include/linux/spi/tsc2102.h
@@ -312,10 +309,10 @@ Index: linux-2.6.29.6/include/linux/spi/tsc2102.h
+};
+
+#endif /* __LINUX_SPI_TSC2102_H */
-Index: linux-2.6.29.6/drivers/spi/tsc2102.c
+Index: linux-2.6.36/drivers/spi/tsc2102.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/spi/tsc2102.c 2010-05-31 13:50:30.000000000 +0200
++++ linux-2.6.36/drivers/spi/tsc2102.c 2010-05-31 13:50:30.000000000 +0200
@@ -0,0 +1,1311 @@
+/*
+ * drivers/spi/tsc2102.c
@@ -1428,7 +1425,7 @@ Index: linux-2.6.29.6/drivers/spi/tsc2102.c
+ pdata->init();
+
+#ifdef CONFIG_TSC_SLAVE
-+ tsc.bclk_ck = clk_get(0, "bclk"); TODO add clock mechanism to i.MX ???
++ tsc.bclk_ck = clk_get(0, "bclk"); //TODO add clock mechanism to i.MX ???
+ if (!tsc.bclk_ck) {
+ printk(KERN_ERR "Unable to get the clock BCLK\n");
+ err = -EPERM;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
new file mode 100644
index 0000000..1fa3c8a
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
@@ -0,0 +1,27 @@
+--- a/drivers/spi/Kconfig 2010-12-07 13:15:03.000000000 +0100
++++ b/drivers/spi/Kconfig 2010-12-07 13:14:38.000000000 +0100
+@@ -379,6 +379,14 @@
+ sysfs interface, with each line presented as a kind of GPIO
+ exposing both switch control and diagnostic feedback.
+
++config SPI_TSC2102
++ depends on SPI_MASTER
++ depends on HWMON = n || HWMON
++ tristate "TSC2102 codec support"
++ ---help---
++ Say Y here if you want support for the TSC2102 chip. It
++ will be needed for the touchscreen driver on some boards.
++
+ #
+ # Add new SPI protocol masters in alphabetical order above this line
+ #
+--- a/drivers/spi/Makefile 2010-12-07 13:15:11.000000000 +0100
++++ b/drivers/spi/Makefile 2010-12-07 13:15:27.000000000 +0100
+@@ -57,6 +57,7 @@
+ # SPI protocol drivers (device/link on bus)
+ obj-$(CONFIG_SPI_SPIDEV) += spidev.o
+ obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o
++obj-$(CONFIG_SPI_TSC2102) += tsc2102.o
+ # ... add above this line ...
+
+ # SPI slave controller drivers (upstream link)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
similarity index 71%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
index ae7187f..008194f 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.29/drivers/input/touchscreen/Kconfig
+Index: linux-2.6.36/drivers/input/touchscreen/Kconfig
===================================================================
---- linux-2.6.29.orig/drivers/input/touchscreen/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/input/touchscreen/Kconfig 2009-03-30 11:14:08.000000000 +0200
+--- a/drivers/input/touchscreen/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ b/drivers/input/touchscreen/Kconfig 2009-03-30 11:14:08.000000000 +0200
@@ -242,6 +242,20 @@
To compile this driver as a module, choose M here: the
module will be called atmel_tsadcc.
@@ -23,10 +23,10 @@ Index: linux-2.6.29/drivers/input/touchscreen/Kconfig
config TOUCHSCREEN_UCB1400
tristate "Philips UCB1400 touchscreen"
depends on AC97_BUS
-Index: linux-2.6.29/drivers/input/touchscreen/Makefile
+Index: linux-2.6.36/drivers/input/touchscreen/Makefile
===================================================================
---- linux-2.6.29.orig/drivers/input/touchscreen/Makefile 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/input/touchscreen/Makefile 2009-03-30 11:15:35.000000000 +0200
+--- a/drivers/input/touchscreen/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ b/drivers/input/touchscreen/Makefile 2009-03-30 11:15:35.000000000 +0200
@@ -25,6 +25,7 @@
obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o
obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/074-armadeus-tsc2102-touchscreen.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/074-armadeus-tsc2102-touchscreen.patch
similarity index 88%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/074-armadeus-tsc2102-touchscreen.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/074-armadeus-tsc2102-touchscreen.patch
index 3fc4c68..a396f84 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/074-armadeus-tsc2102-touchscreen.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/074-armadeus-tsc2102-touchscreen.patch
@@ -1,9 +1,6 @@
-PATCH AUTOMATICALLY GENERATED
-DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
-(Take a look at armadeus/target/linux/ directory to know how to generate it)
---- linux-2.6.27.13.original/drivers/input/touchscreen/tsc2102_ts.c
-+++ linux-2.6.27.13.mod/drivers/input/touchscreen/tsc2102_ts.c
-@@ -0,0 +1,156 @@
+--- /dev/null 2010-11-28 19:42:11.148000001 +0100
++++ b/drivers/input/touchscreen/tsc2102_ts.c 2010-12-13 07:41:34.000000000 +0100
+@@ -0,0 +1,160 @@
+/*
+ * input/touchscreen/tsc2102_ts.c
+ *
@@ -37,6 +34,7 @@ DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
+#include <linux/spi/tsc2102.h>
+
+#define DRIVER_NAME "TSC210x Touchscreen"
++#define TSC2102_TS_MAXVAL ((1 << 12) - 1)
+
+struct input_dev *dev;
+
@@ -92,7 +90,10 @@ DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
+ dev->dev.parent = &pdev->dev;
+ dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+ dev->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
-+ dev->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) | BIT_MASK(ABS_PRESSURE);
++ //dev->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) | BIT_MASK(ABS_PRESSURE);
++ input_set_abs_params(dev, ABS_X, 0, TSC2102_TS_MAXVAL, 0, 0);
++ input_set_abs_params(dev, ABS_Y, 0, TSC2102_TS_MAXVAL, 0, 0);
++ input_set_abs_params(dev, ABS_PRESSURE, 0, TSC2102_TS_MAXVAL, 0, 0);
+ status = input_register_device(dev);
+ if (status) {
+ printk(KERN_INFO "Unable to register TSC210x as input device !\n");
hooks/post-receive
--
armadeus
|
