diff --git a/qcom/lahaina-qrd-common.dtsi b/qcom/lahaina-qrd-common.dtsi index fde9bc11fb6f..87a2b5fff5b6 100644 --- a/qcom/lahaina-qrd-common.dtsi +++ b/qcom/lahaina-qrd-common.dtsi @@ -210,7 +210,7 @@ focaltech,touch-environment = "pvm"; focaltech,trusted-touch-spi-irq = <566>; focaltech,trusted-touch-io-bases = <0xF114000 0xF115000 0xF116000 0xF117000 0x990000 0x00910000>; - focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x4000 0x4000>; + focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>; }; }; diff --git a/qcom/lahaina-vm-cdp.dtsi b/qcom/lahaina-vm-cdp.dtsi index e62004ae5e1e..56be11e2913b 100644 --- a/qcom/lahaina-vm-cdp.dtsi +++ b/qcom/lahaina-vm-cdp.dtsi @@ -1 +1,18 @@ /*#include "display/lahaina-sde-display-cdp.dtsi"*/ + +&qupv3_se4_i2c { + status = "ok"; + st_fts@49 { + compatible = "st,fts"; + reg = <0x49>; + st,x-flip = <1>; + st,y-flip = <1>; + st,regulator_dvdd = "vdd"; + st,regulator_avdd = "avdd"; + st,trusted-touch-mode = "vm_mode"; + st,touch-environment = "tvm"; + st,trusted-touch-spi-irq = <566>; + st,trusted-touch-io-bases = <0xF114000 0xF115000 0xF116000 0xF117000 0x990000 0x00910000>; + st,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>; + }; +}; diff --git a/qcom/lahaina-vm-mtp.dtsi b/qcom/lahaina-vm-mtp.dtsi index 7411556ed73b..135ba4fbeeb6 100644 --- a/qcom/lahaina-vm-mtp.dtsi +++ b/qcom/lahaina-vm-mtp.dtsi @@ -1 +1,18 @@ /*#include "display/lahaina-sde-display-mtp.dtsi"*/ + +&qupv3_se4_i2c { + status = "ok"; + st_fts@49 { + compatible = "st,fts"; + reg = <0x49>; + st,x-flip = <1>; + st,y-flip = <1>; + st,regulator_dvdd = "vdd"; + st,regulator_avdd = "avdd"; + st,trusted-touch-mode = "vm_mode"; + st,touch-environment = "tvm"; + st,trusted-touch-spi-irq = <566>; + st,trusted-touch-io-bases = <0xF114000 0xF115000 0xF116000 0xF117000 0x990000 0x00910000>; + st,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>; + }; +}; diff --git a/qcom/lahaina-vm-qrd.dtsi b/qcom/lahaina-vm-qrd.dtsi index ed306e6a6f78..51e7b6de33a9 100644 --- a/qcom/lahaina-vm-qrd.dtsi +++ b/qcom/lahaina-vm-qrd.dtsi @@ -1 +1,14 @@ /*#include "display/lahaina-sde-display-qrd.dtsi"*/ + +&qupv3_se4_i2c { + status = "ok"; + focaltech@38 { + compatible = "focaltech,fts_ts"; + reg = <0x38>; + focaltech,trusted-touch-mode = "vm_mode"; + focaltech,touch-environment = "tvm"; + focaltech,trusted-touch-spi-irq = <566>; + focaltech,trusted-touch-io-bases = <0xF114000 0xF115000 0xF116000 0xF117000 0x990000 0x00910000>; + focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>; + }; +}; diff --git a/qcom/lahaina-vm.dtsi b/qcom/lahaina-vm.dtsi index 16ccc249fafa..24826e34f88b 100644 --- a/qcom/lahaina-vm.dtsi +++ b/qcom/lahaina-vm.dtsi @@ -302,19 +302,6 @@ qcom,wrapper-core = <&qupv3_0>; qcom,le-vm; status = "ok"; - st_fts@49 { - compatible = "st,fts"; - reg = <0x49>; - st,x-flip = <1>; - st,y-flip = <1>; - st,regulator_dvdd = "vdd"; - st,regulator_avdd = "avdd"; - st,trusted-touch-mode = "vm_mode"; - st,touch-environment = "tvm"; - st,trusted-touch-spi-irq = <566>; - st,trusted-touch-io-bases = <0xF114000 0xF115000 0xF116000 0xF117000 0x990000 0x00910000>; - st,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>; - }; }; qupv3_se4_spi: spi@990000 { @@ -347,3 +334,5 @@ #include "display/trustedvm-lahaina-sde-display.dtsi" #include "display/dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi" #include "display/dsi-panel-sw43404-amoled-dsc-wqhd-video.dtsi" +#include "display/dsi-panel-r66451-dsc-fhd-plus-cmd.dtsi" +#include "display/dsi-panel-r66451-dsc-fhd-plus-video.dtsi"