diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2023-09-28 10:00:53 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-09-28 10:00:58 +0200 |
| commit | 1dca98e70c1057b35afe99417996f11c28350e4b (patch) | |
| tree | e61b1646a90660d88b760cc5e00916df461433f8 | |
| parent | arm64: dts: Add AMD Pensando Elba SoC support (diff) | |
| parent | ARM: dts: st: href-tvk1281618: correct touchscreen syna,nosleep-mode (diff) | |
| download | wireguard-linux-1dca98e70c1057b35afe99417996f11c28350e4b.tar.xz wireguard-linux-1dca98e70c1057b35afe99417996f11c28350e4b.zip | |
Merge tag 'ux500-dts-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into soc/dt
Ux500 device tree updates for v6.7:
- Two fixes from Krzysztof fixing up DT properties
on the touchscreen.
* tag 'ux500-dts-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: dts: st: href-tvk1281618: correct touchscreen syna,nosleep-mode
ARM: dts: st: href-tvk1281618: fix touchscreen VIO supply
Link: https://lore.kernel.org/r/CACRpkdZc5Yzsos2+gRPtCT-+ohmaV69ew5YFJLakD+9VFkrkfQ@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/boot/dts/st/ste-href-tvk1281618-r2.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/st/ste-href-tvk1281618-r2.dtsi b/arch/arm/boot/dts/st/ste-href-tvk1281618-r2.dtsi index 37e59403c01f..7448135e25f6 100644 --- a/arch/arm/boot/dts/st/ste-href-tvk1281618-r2.dtsi +++ b/arch/arm/boot/dts/st/ste-href-tvk1281618-r2.dtsi @@ -192,7 +192,7 @@ #size-cells = <0>; reg = <0x4b>; vdd-supply = <&ab8500_ldo_aux1_reg>; - vddio-supply = <&db8500_vsmps2_reg>; + vio-supply = <&db8500_vsmps2_reg>; pinctrl-names = "default"; pinctrl-0 = <&synaptics_tvk_mode>; interrupt-parent = <&gpio2>; @@ -200,7 +200,7 @@ rmi4-f01@1 { reg = <0x1>; - syna,nosleep = <1>; + syna,nosleep-mode = <1>; }; rmi4-f11@11 { reg = <0x11>; |