From 752aa460c644bbbdbb918799df2bde1a43680410 Mon Sep 17 00:00:00 2001
From: Fei Mao <feim@qti.qualcomm.com>
Date: Fri, 28 May 2021 10:59:54 +0800
Subject: [PATCH 1/2] ARM: dts: msm: Add touch for QRD Holi-pm6125

And new touch node for QRD Holi-pm6125 device.

Change-Id: I5814485668823e2972cbfcb8ccb2d60e6b6620de
---
 qcom/holi-qrd-pm6125.dtsi | 62 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/qcom/holi-qrd-pm6125.dtsi b/qcom/holi-qrd-pm6125.dtsi
index 03a022f1203f..f1514b122d80 100644
--- a/qcom/holi-qrd-pm6125.dtsi
+++ b/qcom/holi-qrd-pm6125.dtsi
@@ -665,3 +665,65 @@
 		};
 	};
 };
+
+&tlmm {
+	touch_avdd_default: touch_avdd_default {
+		mux {
+			pins = "gpio53";
+			function = "gpio";
+		};
+
+		config {
+			pins = "gpio53";
+			drive-strength = <8>;
+			bias-disable = <0>;
+			output-high;
+		};
+	};
+};
+
+&soc {
+	touch_avdd: touch_avdd {
+		compatible = "regulator-fixed";
+		regulator-name = "touch_avdd";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-enable-ramp-delay = <233>;
+		gpio = <&tlmm 53 0>;
+		enable-active-high;
+		pinctrl-names = "default";
+		pinctrl-0 = <&touch_avdd_default>;
+	};
+};
+
+&qupv3_se8_i2c {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	status = "ok";
+	qcom,i2c-touch-active = "focaltech,fts_ts";
+
+	focaltech@38 {
+		compatible = "focaltech,fts_ts";
+		reg = <0x38>;
+		interrupt-parent = <&tlmm>;
+		interrupts = <22 0x2008>;
+		focaltech,reset-gpio = <&tlmm 21 0x00>;
+		focaltech,irq-gpio = <&tlmm 22 0x2008>;
+		focaltech,max-touch-number = <5>;
+		focaltech,display-coords = <0 0 1080 2340>;
+
+		vcc_i2c-supply = <&L9A>;
+		vdd-supply = <&touch_avdd>;
+
+		pinctrl-names = "pmx_ts_active", "pmx_ts_suspend",
+				"pmx_ts_release";
+		pinctrl-0 = <&ts_active>;
+		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
+		pinctrl-2 = <&pmx_ts_release>;
+
+		panel = <&dsi_r66451_amoled_90hz_cmd
+			 &dsi_r66451_amoled_90hz_video
+			 &dsi_r66451_amoled_cmd &dsi_r66451_amoled_video>;
+	};
+};

From 2f287027249b72ff8a283a75e0a5467a92eb05dc Mon Sep 17 00:00:00 2001
From: Fei Mao <feim@qti.qualcomm.com>
Date: Fri, 28 May 2021 10:45:46 +0800
Subject: [PATCH 2/2] ARM: dts: msm: use dummy regulator for new QRD Holi

The 3V eLDO controlled by gpio#53 is always ON, to avoid any
conflict with the ALS sensor that is also using the same GPIO.

Make use of a dummy regulator for the touch 3V supply.

Change-Id: I12f9a0ffb5f2717949569d0c15a2a943bf45be69
---
 qcom/holi-qrd-pm6125.dtsi | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/qcom/holi-qrd-pm6125.dtsi b/qcom/holi-qrd-pm6125.dtsi
index f1514b122d80..3fe6a35823c6 100644
--- a/qcom/holi-qrd-pm6125.dtsi
+++ b/qcom/holi-qrd-pm6125.dtsi
@@ -683,16 +683,16 @@
 };
 
 &soc {
-	touch_avdd: touch_avdd {
-		compatible = "regulator-fixed";
-		regulator-name = "touch_avdd";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-enable-ramp-delay = <233>;
-		gpio = <&tlmm 53 0>;
-		enable-active-high;
-		pinctrl-names = "default";
-		pinctrl-0 = <&touch_avdd_default>;
+	touch_avdd: touch_avdd_stub {
+		/*
+		 * Touch eLDO controlled by gpio#53 is always ON.
+		 * Using dummy regulator.
+		 */
+		compatible = "qcom,stub-regulator";
+		regulator-name = "touch_avdd_stub";
+		qcom,hpm-min-load = <10000>;
+		regulator-min-microvolt = <2700000>;
+		regulator-max-microvolt = <3544000>;
 	};
 };