From 2c276eaba3ccf8faad9728f37d57eaa2f19388d9 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Sun, 21 Mar 2021 02:25:49 +0100 Subject: [PATCH] ARM: dts: ux500: Fix touchscreen on TVK R2 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 --- 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 e024520f4d476..c55993c35bd99 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 @@ <19 IRQ_TYPE_EDGE_RISING>; }; }; + i2c@80110000 { + synaptics@4b { + rmi4-f11@11 { + /* This is a landscape display */ + touchscreen-swapped-x-y; + }; + }; + }; mcde@a0350000 { status = "okay"; diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi index e1dbfae225956..1ee7d001fd313 100644 --- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi +++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi @@ -139,13 +139,12 @@ interrupt-parent = <&gpio2>; interrupts = <20 IRQ_TYPE_EDGE_FALLING>; - rmi-f01@1 { + rmi4-f01@1 { reg = <0x1>; syna,nosleep = <1>; }; - rmi-f11@11 { + rmi4-f11@11 { reg = <0x11>; - touchscreen-inverted-x; syna,sensor-type = <1>; }; }; -- 2.30.2