From c8e6b4fd3562c0a6ed588f096eb3cc1b0906e748 Mon Sep 17 00:00:00 2001
From: Rajeev Nandan <RAJEEVNY@qti.qualcomm.com>
Date: Wed, 19 May 2021 21:53:27 +0530
Subject: [PATCH 1/2] ARM: dts: msm: include display nodes for Blair target

This change includes display DT nodes to enable display
support on Blair target.

Change-Id: Idff6e010b93c87a127abb1bf8db1e3d5a3b49e09
---
 qcom/blair-cdp.dtsi | 5 +++++
 qcom/blair-mtp.dtsi | 1 +
 qcom/blair.dtsi     | 7 +------
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/qcom/blair-cdp.dtsi b/qcom/blair-cdp.dtsi
index 0cec1c66625e..6a838a4152e8 100644
--- a/qcom/blair-cdp.dtsi
+++ b/qcom/blair-cdp.dtsi
@@ -1,7 +1,12 @@
 #include "holi-cdp-pm6125.dtsi"
+#include "display/blair-sde-display-cdp.dtsi"
 / {
 };
 
 &ufsphy_mem {
 	compatible = "qcom,ufs-phy-qmp-v4-yupik";
 };
+
+&pm6125_pwm {
+	status = "ok";
+};
diff --git a/qcom/blair-mtp.dtsi b/qcom/blair-mtp.dtsi
index e76628a3375e..9f9f94eb4e00 100644
--- a/qcom/blair-mtp.dtsi
+++ b/qcom/blair-mtp.dtsi
@@ -1,4 +1,5 @@
 #include "holi-mtp-pm6125.dtsi"
+#include "display/blair-sde-display-mtp.dtsi"
 / {
 };
 
diff --git a/qcom/blair.dtsi b/qcom/blair.dtsi
index 60b42bf4bb09..6d3b9158511b 100644
--- a/qcom/blair.dtsi
+++ b/qcom/blair.dtsi
@@ -3354,7 +3354,7 @@
 #include "camera/holi-camera.dtsi"
 #include "holi-thermal.dtsi"
 #include "holi-qupv3.dtsi"
-#include "display/holi-sde.dtsi"
+#include "display/blair-sde.dtsi"
 #include "holi-audio.dtsi"
 #include "blair-usb.dtsi"
 #include "ipcc-test-holi.dtsi"
@@ -3376,11 +3376,6 @@
 	regulator-max-microvolt = <3544000>;
 };
 
-/* Dummy LDO handle*/
-&mdss_dsi_phy0 {
-	vdda-0p9-supply = <&L2A>;
-};
-
 &gcc_camss_top_gdsc {
 	status = "ok";
 };

From 4e26e8311aa38bbbbd80fdafe147cffa5a4d7f4b Mon Sep 17 00:00:00 2001
From: Rajeev Nandan <RAJEEVNY@qti.qualcomm.com>
Date: Wed, 19 May 2021 22:22:15 +0530
Subject: [PATCH 2/2] ARM: dts: msm: add touch support of lcd panel for Blair
 target

This change adds touch support of nt36672e lcd panel for
CDP platform of the Blair target.

Change-Id: I15d5f8e95c4fb113dc13a47e54738bb54c5a437d
---
 qcom/blair-cdp.dtsi | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/qcom/blair-cdp.dtsi b/qcom/blair-cdp.dtsi
index 6a838a4152e8..266eafca1927 100644
--- a/qcom/blair-cdp.dtsi
+++ b/qcom/blair-cdp.dtsi
@@ -10,3 +10,32 @@
 &pm6125_pwm {
 	status = "ok";
 };
+
+&qupv3_se8_i2c {
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	status = "ok";
+
+	novatek@62 {
+		compatible = "novatek,NVT-ts";
+		reg = <0x62>;
+
+		interrupt-parent = <&tlmm>;
+		interrupts = <22 0x2008>;
+
+		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>;
+
+		novatek,reset-gpio = <&tlmm 21 0x00>;
+		novatek,irq-gpio = <&tlmm 22 0x2008>;
+
+		panel = <&dsi_nt36672e_fhd_plus_60_video
+			&dsi_nt36672e_fhd_plus_120_video
+			&dsi_nt36672e_fhd_plus_144_video>;
+	};
+};