ARM: dts: sunxi: Adjust touchscreen compatible for sun5i and later

This is a manual cherry pick of a commit currently queued up for merging into 4.2, titled:
"ARM: dts: sunxi Adjust touchscreen compatible for sun5i and later"

For the 4.1 stable series, fixing a regression in 4.1 where we are now reporting the wrong SoC temperature for sun5i and sun7i SoCs.

Conflicts:
arch/arm/boot/dts/sun5i.dtsi

Original commit message:

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.

---
 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(-)

index 2fd8988..3794ca1 100644
@@ -573,7 +573,7 @@
 		};
 
 		rtp: rtp at 01c25000 {
-			compatible = "allwinner,sun4i-a10-ts";
+			compatible = "allwinner,sun5i-a13-ts";
 			reg = <0x01c25000 0x100>;
 			interrupts = <29>;
 			#thermal-sensor-cells = <0>;

index 883cb48..5098185 100644
@@ -555,7 +555,7 @@
 		};
 
 		rtp: rtp at 01c25000 {
-			compatible = "allwinner,sun4i-a10-ts";
+			compatible = "allwinner,sun5i-a13-ts";
 			reg = <0x01c25000 0x100>;
 			interrupts = <29>;
 			#thermal-sensor-cells = <0>;

index fdd1817..2b4847c 100644
@@ -1042,7 +1042,7 @@
 		};
 
 		rtp: rtp at 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>;

2.4.3

What is the git commit id of it? I can't do anything with this until it hits Linus's tree.

thanks,

greg k-h

Sorry, once again in plain text mode:

It's in Linus' tree now:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=8bf1b9b3d90194a174493febc731f7783f2adf1a

Regards,

Timo

Thanks, now queued up.

greg k-h