From e08d91fbba053195eebcb73447dcfe96aa9ca195 Mon Sep 17 00:00:00 2001
From: Jeykumar Sankaran <jeykumar@quicinc.com>
Date: Tue, 7 Jul 2020 14:52:00 -0700
Subject: [PATCH] ARM: dts: msm: move dsi ctrl power nodes to common dt for
 Lahaina

Move DSI ctrl power handles nodes from lahaina HLOS dt
to common dt file as they are needed by all the vm's.

Change-Id: Id59f51e1e9e821bb5b02dd26ec41aff71950c306
---
 display/lahaina-sde-common.dtsi | 54 ++++++++++++++++++++++++++++++++
 display/lahaina-sde.dtsi        | 55 ---------------------------------
 2 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/display/lahaina-sde-common.dtsi b/display/lahaina-sde-common.dtsi
index 8dd8954df0c3..bd93fb5130b3 100644
--- a/display/lahaina-sde-common.dtsi
+++ b/display/lahaina-sde-common.dtsi
@@ -280,6 +280,33 @@
 		reg-names = "dsi_ctrl", "disp_cc_base";
 		interrupt-parent = <&mdss_mdp>;
 		interrupts = <4 0>;
+
+		qcom,ctrl-supply-entries {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			qcom,ctrl-supply-entry@0 {
+				reg = <0>;
+				qcom,supply-name = "vdda-1p2";
+				qcom,supply-min-voltage = <1200000>;
+				qcom,supply-max-voltage = <1200000>;
+				qcom,supply-enable-load = <8350>;
+				qcom,supply-disable-load = <0>;
+			};
+		};
+
+		qcom,core-supply-entries {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			qcom,core-supply-entry@0 {
+				reg = <0>;
+				qcom,supply-name = "refgen";
+				qcom,supply-min-voltage = <0>;
+				qcom,supply-max-voltage = <0>;
+				qcom,supply-enable-load = <0>;
+				qcom,supply-disable-load = <0>;
+			};
+		};
 	};
 
 	mdss_dsi1: qcom,mdss_dsi_ctrl1@ae96000 {
@@ -292,6 +319,33 @@
 		reg-names = "dsi_ctrl", "disp_cc_base";
 		interrupt-parent = <&mdss_mdp>;
 		interrupts = <5 0>;
+
+		qcom,ctrl-supply-entries {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			qcom,ctrl-supply-entry@0 {
+				reg = <0>;
+				qcom,supply-name = "vdda-1p2";
+				qcom,supply-min-voltage = <1200000>;
+				qcom,supply-max-voltage = <1200000>;
+				qcom,supply-enable-load = <8350>;
+				qcom,supply-disable-load = <0>;
+			};
+		};
+
+		qcom,core-supply-entries {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			qcom,core-supply-entry@0 {
+				reg = <0>;
+				qcom,supply-name = "refgen";
+				qcom,supply-min-voltage = <0>;
+				qcom,supply-max-voltage = <0>;
+				qcom,supply-enable-load = <0>;
+				qcom,supply-disable-load = <0>;
+			};
+		};
 	};
 
 	mdss_dsi_phy0: qcom,mdss_dsi_phy0@ae94900 {
diff --git a/display/lahaina-sde.dtsi b/display/lahaina-sde.dtsi
index 4aa15c2d2e45..870528fae30e 100644
--- a/display/lahaina-sde.dtsi
+++ b/display/lahaina-sde.dtsi
@@ -247,33 +247,6 @@
 		<&clock_dispcc DISP_CC_MDSS_ESC0_CLK>;
 	clock-names = "byte_clk", "byte_clk_rcg", "byte_intf_clk",
 			"pixel_clk", "pixel_clk_rcg", "esc_clk";
-
-	qcom,ctrl-supply-entries {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		qcom,ctrl-supply-entry@0 {
-			reg = <0>;
-			qcom,supply-name = "vdda-1p2";
-			qcom,supply-min-voltage = <1200000>;
-			qcom,supply-max-voltage = <1200000>;
-			qcom,supply-enable-load = <8350>;
-			qcom,supply-disable-load = <0>;
-		};
-	};
-
-	qcom,core-supply-entries {
-		#address-cells = <1>;
-		#size-cells = <0>;
-			qcom,core-supply-entry@0 {
-			reg = <0>;
-			qcom,supply-name = "refgen";
-			qcom,supply-min-voltage = <0>;
-			qcom,supply-max-voltage = <0>;
-			qcom,supply-enable-load = <0>;
-			qcom,supply-disable-load = <0>;
-		};
-	};
 };
 
 &mdss_dsi1 {
@@ -287,34 +260,6 @@
 		<&clock_dispcc DISP_CC_MDSS_ESC1_CLK>;
 	clock-names = "byte_clk", "byte_clk_rcg", "byte_intf_clk",
 			"pixel_clk", "pixel_clk_rcg", "esc_clk";
-
-	qcom,ctrl-supply-entries {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		qcom,ctrl-supply-entry@0 {
-			reg = <0>;
-			qcom,supply-name = "vdda-1p2";
-			qcom,supply-min-voltage = <1200000>;
-			qcom,supply-max-voltage = <1200000>;
-			qcom,supply-enable-load = <8350>;
-			qcom,supply-disable-load = <0>;
-		};
-	};
-
-	qcom,core-supply-entries {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		qcom,core-supply-entry@0 {
-			reg = <0>;
-			qcom,supply-name = "refgen";
-			qcom,supply-min-voltage = <0>;
-			qcom,supply-max-voltage = <0>;
-			qcom,supply-enable-load = <0>;
-			qcom,supply-disable-load = <0>;
-		};
-	};
 };
 
 &mdss_dsi_phy0 {