From 38707df4bfde73ef09dfb2a0d407c842b3197ddd Mon Sep 17 00:00:00 2001
From: Vignesh Viswanathan <viswanat@qti.qualcomm.com>
Date: Wed, 25 Aug 2021 18:17:48 +0530
Subject: [PATCH] ARM: dts: qcom: Move all WLAN configs out of
 sdxlemur-mtp-cpe.dtsi

sdxlemur-mtp-cpe.dtsi is included in sdxlemur-mtp-cpe.dts as well as
sdxlemur-mtp-cpe-pine1x.dts. WLAN configs present in
sdxlemur-mtp-cpe.dtsi is not applicable for sdxlemur-mtp-cpe-pine1x.dts.

Move all WLAN specific configurations from sdxlemur-mtp-cpe.dtsi to a
new file sdxlemur-mtp-cpe-hsp.dtsi and include this file in
sdxlemur-mtp-cpe.dts only.

Change-Id: I245662cf6b23dcb3b5c5fc5ce2ac61783b801cdc
---
 qcom/sdxlemur-mtp-cpe-hsp.dtsi | 41 ++++++++++++++++++++++++++++++++++
 qcom/sdxlemur-mtp-cpe.dts      |  1 +
 qcom/sdxlemur-mtp-cpe.dtsi     | 36 -----------------------------
 3 files changed, 42 insertions(+), 36 deletions(-)
 create mode 100644 qcom/sdxlemur-mtp-cpe-hsp.dtsi

diff --git a/qcom/sdxlemur-mtp-cpe-hsp.dtsi b/qcom/sdxlemur-mtp-cpe-hsp.dtsi
new file mode 100644
index 000000000000..d9969be2f7be
--- /dev/null
+++ b/qcom/sdxlemur-mtp-cpe-hsp.dtsi
@@ -0,0 +1,41 @@
+#include "sdxlemur-cnss.dtsi"
+
+&pcie0 {
+	qcom,boot-option = <0x1>;
+};
+
+&pcie0_bus2_dev2_fn0 {
+	cnss_pci0: cnss_pci0 {
+		reg = <0 0 0 0 0>;
+		qcom,iommu-group = <&cnss_pci_iommu_group>;
+		memory-region = <&cnss_wlan_mem>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+	};
+};
+
+&wlan {
+	mhi_events {
+		mhi_event@0 {
+			mhi,num-elements = <32>;
+			mhi,intmod = <0>;
+			mhi,msi = <1>;
+			mhi,priority = <0>;
+			mhi,brstmode = <2>;
+			mhi,data-type = <1>;
+		};
+
+		mhi_event@1 {
+			mhi,num-elements = <256>;
+			mhi,intmod = <0>;
+			mhi,msi = <2>;
+			mhi,priority = <1>;
+			mhi,brstmode = <2>;
+		};
+
+		mhi_event@2 {
+			status = "disabled";
+		};
+	};
+};
diff --git a/qcom/sdxlemur-mtp-cpe.dts b/qcom/sdxlemur-mtp-cpe.dts
index b5417a3ea95c..3942c230e2bd 100644
--- a/qcom/sdxlemur-mtp-cpe.dts
+++ b/qcom/sdxlemur-mtp-cpe.dts
@@ -2,6 +2,7 @@
 
 #include "sdxlemur.dtsi"
 #include "sdxlemur-mtp-cpe.dtsi"
+#include "sdxlemur-mtp-cpe-hsp.dtsi"
 #include "sdxlemur-1024mb-cpe.dtsi"
 #include "sdxlemur-audio.dtsi"
 #include "sdxlemur-mtp-audio-overlay.dtsi"
diff --git a/qcom/sdxlemur-mtp-cpe.dtsi b/qcom/sdxlemur-mtp-cpe.dtsi
index 38cdf380631b..4679c7bc2f2a 100644
--- a/qcom/sdxlemur-mtp-cpe.dtsi
+++ b/qcom/sdxlemur-mtp-cpe.dtsi
@@ -91,7 +91,6 @@
 
 
 &pcie0 {
-	qcom,boot-option = <0x1>;
 	pcie-i2c-phandle = <&i2c_5>;
 
 	vreg-3p3-supply = <&aqr_vreg>;
@@ -123,14 +122,6 @@
 		/* BDF 2.2.0 */
 		pcie0_bus2_dev2_fn0: pcie0_bus2_dev2_fn0 {
 			reg = <0x1000 0x0 0x0 0x0 0x0>;
-			cnss_pci0: cnss_pci0 {
-				reg = <0 0 0 0 0>;
-				qcom,iommu-group = <&cnss_pci_iommu_group>;
-				memory-region = <&cnss_wlan_mem>;
-
-				#address-cells = <1>;
-				#size-cells = <1>;
-			};
 		};
 
 		/* BDF 2.3.0 */
@@ -182,30 +173,3 @@
 		};
 	};
 };
-
-#include "sdxlemur-cnss.dtsi"
-
-&wlan {
-	mhi_events {
-		mhi_event@0 {
-			mhi,num-elements = <32>;
-			mhi,intmod = <0>;
-			mhi,msi = <1>;
-			mhi,priority = <0>;
-			mhi,brstmode = <2>;
-			mhi,data-type = <1>;
-		};
-
-		mhi_event@1 {
-			mhi,num-elements = <256>;
-			mhi,intmod = <0>;
-			mhi,msi = <2>;
-			mhi,priority = <1>;
-			mhi,brstmode = <2>;
-		};
-
-		mhi_event@2 {
-			status = "disabled";
-		};
-	};
-};