summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2021-03-21 02:25:49 +0100
committerLinus Walleij <linus.walleij@linaro.org>2021-03-26 10:42:31 +0100
commit2c276eaba3ccf8faad9728f37d57eaa2f19388d9 (patch)
treef7bade304ef2e53813f58f328e0d2f16ceaa4679
parent2a5b057032a39e56817b2fd55c5c0d0cc246a979 (diff)
downloadlinux-2c276eaba3ccf8faad9728f37d57eaa2f19388d9.tar.bz2
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 <linus.walleij@linaro.org>
-rw-r--r--arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi8
-rw-r--r--arch/arm/boot/dts/ste-href-tvk1281618.dtsi5
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 @@
<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 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 @@
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>;
};
};