From 45e58cc22c8249a9fdf495ba3affbfbfcde2bef7 Mon Sep 17 00:00:00 2001 From: Ritesh Kumar Date: Sun, 6 Sep 2020 02:15:13 +0530 Subject: [PATCH] ARM: dts: msm: Add focaltech node in trustedvm devicetree Add focaltech node for trusted vm device tree and enable trusted touch on trusted vm for lahaina qrd. Also, move fts node to mtp and cdp vm dtsi file. Change-Id: I2e8f80a2b6c622c02526cbc6a2b2a1f8d632d593 --- qcom/lahaina-vm-cdp.dtsi | 17 +++++++++++++++++ qcom/lahaina-vm-mtp.dtsi | 17 +++++++++++++++++ qcom/lahaina-vm-qrd.dtsi | 13 +++++++++++++ qcom/lahaina-vm.dtsi | 13 ------------- 4 files changed, 47 insertions(+), 13 deletions(-) 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..5f14095b5dd1 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 {