From 2fd90e08347c57a54cd0323fb22445a13a5e84a3 Mon Sep 17 00:00:00 2001
From: Ritesh Kumar <riteshk@qti.qualcomm.com>
Date: Sat, 13 Feb 2021 14:44:11 +0530
Subject: [PATCH 1/2] ARM: dts: msm:  Add focaltech spi touch node in yupik qrd
 svm

Add focaltech spi trusted touch node in yupik qrd trusted vm.

Change-Id: Ie7907d3054bb399238ab07008f4af64679adc453
---
 qcom/yupik-vm-idp.dtsi | 17 +++++++++++++++++
 qcom/yupik-vm-qrd.dtsi | 21 +++++++++++++++++++++
 qcom/yupik-vm.dtsi     | 11 +----------
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/qcom/yupik-vm-idp.dtsi b/qcom/yupik-vm-idp.dtsi
index 17f1e228977f..4b35423120b9 100644
--- a/qcom/yupik-vm-idp.dtsi
+++ b/qcom/yupik-vm-idp.dtsi
@@ -1,2 +1,19 @@
 &soc {
 };
+
+&qupv3_se13_i2c {
+	status = "ok";
+	novatek@62 {
+		compatible = "novatek,NVT-ts";
+		reg = <0x62>;
+		novatek,trusted-touch-mode = "vm_mode";
+		novatek,touch-environment = "tvm";
+		novatek,trusted-touch-spi-irq = <601>;
+		novatek,trusted-touch-io-bases = <0xf134000 0xf135000 0xf169000 0xf151000 0xa94000 0x00a10000>;
+		novatek,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
+	};
+};
+
+&qupv3_se13_spi {
+	status = "disabled";
+};
diff --git a/qcom/yupik-vm-qrd.dtsi b/qcom/yupik-vm-qrd.dtsi
index 17f1e228977f..663740454ebd 100644
--- a/qcom/yupik-vm-qrd.dtsi
+++ b/qcom/yupik-vm-qrd.dtsi
@@ -1,2 +1,23 @@
 &soc {
 };
+
+&qupv3_se13_i2c {
+	status = "disabled";
+};
+
+&qupv3_se13_spi {
+	status = "ok";
+	focaltech@0 {
+		compatible = "focaltech,fts_ts";
+		reg = <0x0>;
+		spi-max-frequency = <6000000>;
+		focaltech,max-touch-number = <5>;
+		focaltech,display-coords = <0 0 1080 2340>;
+		focaltech,ic-type = <0x3658D488>;
+		focaltech,trusted-touch-mode = "vm_mode";
+		focaltech,touch-environment = "tvm";
+		focaltech,trusted-touch-spi-irq = <601>;
+		focaltech,trusted-touch-io-bases = <0xf134000 0xf135000 0xf136000 0xf137000 0xf169000 0xf151000 0xa94000 0x00a10000>;
+		focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
+	};
+};
diff --git a/qcom/yupik-vm.dtsi b/qcom/yupik-vm.dtsi
index c3e4356bd0fb..2d7ee6a5baf8 100644
--- a/qcom/yupik-vm.dtsi
+++ b/qcom/yupik-vm.dtsi
@@ -281,16 +281,7 @@
 		dma-names = "tx", "rx";
 		qcom,wrapper-core = <&qupv3_1>;
 		qcom,le-vm;
-		status = "ok";
-		novatek@62 {
-			compatible = "novatek,NVT-ts";
-			reg = <0x62>;
-			novatek,trusted-touch-mode = "vm_mode";
-			novatek,touch-environment = "tvm";
-			novatek,trusted-touch-spi-irq = <601>;
-			novatek,trusted-touch-io-bases = <0xf134000 0xf135000 0xf169000 0xf151000 0xa94000 0x00a10000>;
-			novatek,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
-		};
+		status = "disabled";
 	};
 
 	qupv3_se13_spi: spi@a94000 {

From 9b39abc1d0932fdcd6048acb36ffebf1832ba9ab Mon Sep 17 00:00:00 2001
From: Ritesh Kumar <riteshk@qti.qualcomm.com>
Date: Sat, 13 Feb 2021 14:48:26 +0530
Subject: [PATCH 2/2] ARM: dts: msm: Add trusted touch entries on yupik qrd

Add focaltech trusted touch entries on yupik qrd.

Change-Id: Ibfc25489dbf9d95859cf10a0ff50044c7fe48ed5
---
 qcom/yupik-qrd.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qcom/yupik-qrd.dtsi b/qcom/yupik-qrd.dtsi
index a6e7bdab2c0d..6d36276bfd34 100644
--- a/qcom/yupik-qrd.dtsi
+++ b/qcom/yupik-qrd.dtsi
@@ -605,6 +605,11 @@
 		pinctrl-0 = <&ts_active>;
 		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
 		pinctrl-2 = <&ts_release>;
+		focaltech,trusted-touch-mode = "vm_mode";
+		focaltech,touch-environment = "pvm";
+		focaltech,trusted-touch-spi-irq = <601>;
+		focaltech,trusted-touch-io-bases = <0xf134000 0xf135000 0xf136000 0xf137000 0xf169000 0xf151000 0xa94000 0x00a10000>;
+		focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
 		panel = <&dsi_r66451_amoled_144hz_cmd_cphy &dsi_r66451_amoled_120hz_cmd_cphy
 			&dsi_r66451_amoled_90hz_cmd_cphy &dsi_r66451_amoled_60hz_cmd_cphy>;
 	};