4.1-stable patches

added patches:
	arm-dts-sunxi-adjust-touchscreen-compatible-for-sun5i-and-later.patch

diff --git a/queue-4.1/arm-dts-sunxi-adjust-touchscreen-compatible-for-sun5i-and-later.patch b/queue-4.1/arm-dts-sunxi-adjust-touchscreen-compatible-for-sun5i-and-later.patch
new file mode 100644 (file)
index 0000000..fd8fef8
--- /dev/null
+++ b/queue-4.1/arm-dts-sunxi-adjust-touchscreen-compatible-for-sun5i-and-later.patch
@@ -0,0 +1,57 @@
+From 8bf1b9b3d90194a174493febc731f7783f2adf1a Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Sun, 8 Mar 2015 21:53:42 +0100
+Subject: ARM: dts: sunxi: Adjust touchscreen compatible for sun5i and later
+
+From: Hans de Goede <hdegoede@redhat.com>
+
+commit 8bf1b9b3d90194a174493febc731f7783f2adf1a upstream.
+
+The touchscreen controller in the A13 and later has a different temperature
+curve than the one in the original A10, change the compatible for the A13 and
+later so that the kernel will use the correct curve.
+
+Reported-by: Tong Zhang <lovewilliam@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/boot/dts/sun5i-a10s.dtsi |    2 +-
+ arch/arm/boot/dts/sun5i-a13.dtsi  |    2 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi  |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
++++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
+@@ -573,7 +573,7 @@
+               };
+ 
+               rtp: rtp@01c25000 {
+-                      compatible = "allwinner,sun4i-a10-ts";
++                      compatible = "allwinner,sun5i-a13-ts";
+                       reg = <0x01c25000 0x100>;
+                       interrupts = <29>;
+                       #thermal-sensor-cells = <0>;
+--- a/arch/arm/boot/dts/sun5i-a13.dtsi
++++ b/arch/arm/boot/dts/sun5i-a13.dtsi
+@@ -555,7 +555,7 @@
+               };
+ 
+               rtp: rtp@01c25000 {
+-                      compatible = "allwinner,sun4i-a10-ts";
++                      compatible = "allwinner,sun5i-a13-ts";
+                       reg = <0x01c25000 0x100>;
+                       interrupts = <29>;
+                       #thermal-sensor-cells = <0>;
+--- a/arch/arm/boot/dts/sun7i-a20.dtsi
++++ b/arch/arm/boot/dts/sun7i-a20.dtsi
+@@ -1042,7 +1042,7 @@
+               };
+ 
+               rtp: rtp@01c25000 {
+-                      compatible = "allwinner,sun4i-a10-ts";
++                      compatible = "allwinner,sun5i-a13-ts";
+                       reg = <0x01c25000 0x100>;
+                       interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                       #thermal-sensor-cells = <0>;

diff --git a/queue-4.1/series b/queue-4.1/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e4b9283df96bf596b3346e6a0fbcd68061accd5d 100644 (file)
--- a/queue-4.1/series
+++ b/queue-4.1/series
@@ -0,0 +1 @@
+arm-dts-sunxi-adjust-touchscreen-compatible-for-sun5i-and-later.patch