diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2021-03-23 00:33:14 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2021-03-26 12:45:15 +0300 |
| commit | b428648f60ead796c9d8bb653b44bbbafbf16797 (patch) | |
| tree | ddaea9748bce5b7169766999b7a13f066632cfcb | |
| parent | 2c276eaba3ccf8faad9728f37d57eaa2f19388d9 (diff) | |
| download | linux-b428648f60ead796c9d8bb653b44bbbafbf16797.tar.xz | |
ARM: dts: ux500: Move Synaptics to right include
The Synaptics RMI4 touchscreen is a property of the
TVK1281618 R2 UIB, so move it into that file instead
of the main TVK1281618 main include so we can define
another touchscreen for the R3 UIB.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi | 29 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 34 |
2 files changed, 29 insertions, 34 deletions
diff --git a/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi index c55993c35bd9..de6acee738e5 100644 --- a/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi +++ b/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi @@ -65,7 +65,25 @@ }; i2c@80110000 { synaptics@4b { + /* Synaptics RMI4 TM1217 touchscreen */ + compatible = "syna,rmi4-i2c"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x4b>; + vdd-supply = <&ab8500_ldo_aux1_reg>; + vddio-supply = <&db8500_vsmps2_reg>; + pinctrl-names = "default"; + pinctrl-0 = <&synaptics_tvk_mode>; + interrupt-parent = <&gpio2>; + interrupts = <20 IRQ_TYPE_EDGE_FALLING>; + + rmi4-f01@1 { + reg = <0x1>; + syna,nosleep = <1>; + }; rmi4-f11@11 { + reg = <0x11>; + syna,sensor-type = <1>; /* This is a landscape display */ touchscreen-swapped-x-y; }; @@ -83,5 +101,16 @@ }; }; }; + pinctrl { + synaptics { + synaptics_tvk_mode: synaptics_tvk { + /* Touchscreen uses GPIO 84 */ + tvk_cfg1 { + pins = "GPIO84_C2"; + ste,config = <&gpio_in_pu>; + }; + }; + }; + }; }; }; diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi index 1ee7d001fd31..34b9f434b4b7 100644 --- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi +++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi @@ -125,31 +125,6 @@ }; }; - i2c@80110000 { - synaptics@4b { - /* Synaptics RMI4 TM1217 touchscreen */ - compatible = "syna,rmi4-i2c"; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x4b>; - vdd-supply = <&ab8500_ldo_aux1_reg>; - vddio-supply = <&db8500_vsmps2_reg>; - pinctrl-names = "default"; - pinctrl-0 = <&synaptics_tvk_mode>; - interrupt-parent = <&gpio2>; - interrupts = <20 IRQ_TYPE_EDGE_FALLING>; - - rmi4-f01@1 { - reg = <0x1>; - syna,nosleep = <1>; - }; - rmi4-f11@11 { - reg = <0x11>; - syna,sensor-type = <1>; - }; - }; - }; - pinctrl { /* Pull up this GPIO pin */ tc35893 { @@ -203,15 +178,6 @@ }; }; }; - synaptics { - synaptics_tvk_mode: synaptics_tvk { - /* Touchscreen uses GPIO 84 */ - tvk_cfg1 { - pins = "GPIO84_C2"; - ste,config = <&gpio_in_pu>; - }; - }; - }; }; }; }; |