[PATCH] ARM: dts: ux500: Fix touchscreen on TVK R2

[Linus Walleij]

The touchscreen is mounted with flipped x/y on the R2
version of TVK1281618. Push this setting to that DTS file
only.

The function nodes were named wrong so the OF properties
didn not "take". Fix the node names from "rmi-fnn" to
"rmi4-nn" so this also work.

Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
---
 arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi | 8 ++++++++
 arch/arm/boot/dts/ste-href-tvk1281618.dtsi    | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
index e024520f4d47..c55993c35bd9 100644
--- a/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
@@ -63,6 +63,14 @@ lis331dl at 1c {
 					     <19 IRQ_TYPE_EDGE_RISING>;
 			};
 		};
+		i2c at 80110000 {
+			synaptics at 4b {
+				rmi4-f11 at 11 {
+					/* This is a landscape display */
+					touchscreen-swapped-x-y;
+				};
+			};
+		};
 		mcde at a0350000 {
 			status = "okay";
 
diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
index e1dbfae22595..1ee7d001fd31 100644
--- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
@@ -139,13 +139,12 @@ synaptics at 4b {
 				interrupt-parent = <&gpio2>;
 				interrupts = <20 IRQ_TYPE_EDGE_FALLING>;
 
-				rmi-f01 at 1 {
+				rmi4-f01 at 1 {
 					reg = <0x1>;
 					syna,nosleep = <1>;
 				};
-				rmi-f11 at 11 {
+				rmi4-f11 at 11 {
 					reg = <0x11>;
-					touchscreen-inverted-x;
 					syna,sensor-type = <1>;
 				};
 			};
-- 
2.29.2