diff --git a/qcom/ravelin-adrastea.dtsi b/qcom/ravelin-adrastea.dtsi
new file mode 100644
index 00000000..bfa675d0
--- /dev/null
+++ b/qcom/ravelin-adrastea.dtsi
@@ -0,0 +1,61 @@
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/gpio/gpio.h>
+
+&reserved_memory {
+	wlan_msa_mem: wlan_msa_mem_region@82a00000 {
+		no-map;
+		reg = <0x0 0x82a00000 0x0 0x300000>;
+	};
+};
+
+&soc {
+	wpss_pas: remoteproc-wpss@8a00000 {
+		firmware-name = "adrastea/wpss.mdt";
+	};
+
+	icnss: qcom,icnss@22800000 {
+		compatible = "qcom,icnss";
+		reg = <0x22800000 0x800000>;
+		reg-names = "membase";
+		qcom,rproc-handle = <&wpss_pas>;
+		iommus = <&apps_smmu 0x4c0 0x1>;
+		interrupts = <GIC_SPI 389 IRQ_TYPE_LEVEL_HIGH /* CE0 */ >,
+			     <GIC_SPI 413 IRQ_TYPE_LEVEL_HIGH /* CE1 */ >,
+			     <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH /* CE2 */ >,
+			     <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH /* CE3 */ >,
+			     <GIC_SPI 434 IRQ_TYPE_LEVEL_HIGH /* CE4 */ >,
+			     <GIC_SPI 435 IRQ_TYPE_LEVEL_HIGH /* CE5 */ >,
+			     <GIC_SPI 438 IRQ_TYPE_LEVEL_HIGH /* CE6 */ >,
+			     <GIC_SPI 439 IRQ_TYPE_LEVEL_HIGH /* CE7 */ >,
+			     <GIC_SPI 440 IRQ_TYPE_LEVEL_HIGH /* CE8 */ >,
+			     <GIC_SPI 451 IRQ_TYPE_LEVEL_HIGH /* CE9 */ >,
+			     <GIC_SPI 453 IRQ_TYPE_LEVEL_HIGH /* CE10 */ >,
+			     <GIC_SPI 454 IRQ_TYPE_LEVEL_HIGH /* CE11 */ >;
+		qcom,iommu-dma = "fastmap";
+		qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal";
+		qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>;
+		qcom,iommu-geometry = <0xa0000000 0x10000000>;
+		qcom,fw-prefix;
+		qcom,wlan;
+		bdf-download-support;
+		wpss-support-enable;
+		qcom,wlan-msa-fixed-region = <&wlan_msa_mem>;
+		vdd-cx-mx-supply = <&L11B>;
+		vdd-1.8-xo-supply = <&L23B>;
+		vdd-1.3-rfa-supply = <&L14B>;
+		vdd-3.3-ch0-supply = <&L7E>;
+		qcom,vdd-cx-mx-config = <0 0>;
+		qcom,vdd-3.3-ch0-config = <3000000 3312000>;
+
+		qcom,smem-states = <&smp2p_wlan_1_out 0>;
+		qcom,smem-state-names = "wlan-smp2p-out";
+
+		qcom,smp2p_map_wlan_1_in {
+			interrupts-extended = <&smp2p_wlan_1_in 0 0>,
+					      <&smp2p_wlan_1_in 1 0>;
+			interrupt-names = "qcom,smp2p-force-fatal-error",
+					  "qcom,smp2p-early-crash-ind";
+		};
+
+	};
+};
diff --git a/qcom/ravelin-atp.dtsi b/qcom/ravelin-atp.dtsi
index 3c2a22b2..fe0a2a63 100644
--- a/qcom/ravelin-atp.dtsi
+++ b/qcom/ravelin-atp.dtsi
@@ -1,6 +1,7 @@
 #include "ravelin-pmic-overlay.dtsi"
 #include "ravelin-pm7250b.dtsi"
 #include "ravelin-thermal-overlay.dtsi"
+#include "ravelin-adrastea.dtsi"
 
 &soc {
 };
diff --git a/qcom/ravelin-idp-overlay.dts b/qcom/ravelin-idp-overlay.dts
index 99bcbf05..136f0877 100644
--- a/qcom/ravelin-idp-overlay.dts
+++ b/qcom/ravelin-idp-overlay.dts
@@ -2,6 +2,7 @@
 /plugin/;
 
 #include "ravelin-idp.dtsi"
+#include "ravelin-adrastea.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Ravelin IDP";
diff --git a/qcom/ravelin-idp-wcn3950-amoled-rcm.dtsi b/qcom/ravelin-idp-wcn3950-amoled-rcm.dtsi
index d70edfc9..2f31ba31 100644
--- a/qcom/ravelin-idp-wcn3950-amoled-rcm.dtsi
+++ b/qcom/ravelin-idp-wcn3950-amoled-rcm.dtsi
@@ -1,3 +1,4 @@
+#include "ravelin-adrastea.dtsi"
 #include "ravelin-idp.dtsi"
 
 &soc {
diff --git a/qcom/ravelin-idp-wcn3988-4gb.dtsi b/qcom/ravelin-idp-wcn3988-4gb.dtsi
index 9f35c99a..3a109d07 100644
--- a/qcom/ravelin-idp-wcn3988-4gb.dtsi
+++ b/qcom/ravelin-idp-wcn3988-4gb.dtsi
@@ -1,2 +1,2 @@
 #include "ravelin-idp.dtsi"
-
+#include "ravelin-adrastea.dtsi"
diff --git a/qcom/ravelin-idp.dts b/qcom/ravelin-idp.dts
index 9e5dcc60..ff33071b 100644
--- a/qcom/ravelin-idp.dts
+++ b/qcom/ravelin-idp.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 
 #include "ravelin.dtsi"
+#include "ravelin-adrastea.dtsi"
 #include "ravelin-idp.dtsi"
 
 / {
diff --git a/qcom/ravelin-qrd.dtsi b/qcom/ravelin-qrd.dtsi
index 129cc9b1..343aff62 100644
--- a/qcom/ravelin-qrd.dtsi
+++ b/qcom/ravelin-qrd.dtsi
@@ -1,6 +1,7 @@
 #include "ravelin-pmic-overlay.dtsi"
 #include "ravelin-pmi632.dtsi"
 #include "ravelin-thermal-overlay.dtsi"
+#include "ravelin-adrastea.dtsi"
 
 &soc {
 };
diff --git a/qcom/ravelin.dtsi b/qcom/ravelin.dtsi
index 0117b279..2fa543cb 100644
--- a/qcom/ravelin.dtsi
+++ b/qcom/ravelin.dtsi
@@ -425,11 +425,6 @@
 		size = <0x0 0x5c00000>;
 		alignment = <0x0 0x400000>;
 	};
-
-	wlan_msa_mem: wlan_msa_mem_region@82a00000 {
-		no-map;
-		reg = <0x0 0x82a00000 0x0 0x300000>;
-	};
 };
 
 &firmware {
@@ -2311,7 +2306,6 @@
 		status = "ok";
 
 		memory-region = <&wpss_moselle_mem>;
-		firmware-name = "adrastea/wpss.mdt";
 
 		clocks = <&rpmhcc RPMH_CXO_CLK>;
 		clock-names = "xo";
@@ -2603,52 +2597,6 @@
 		};
 	};
 
-	icnss: qcom,icnss@22800000 {
-		compatible = "qcom,icnss";
-		reg = <0x22800000 0x800000>;
-		reg-names = "membase";
-		qcom,rproc-handle = <&wpss_pas>;
-		iommus = <&apps_smmu 0x4c0 0x1>;
-		interrupts = <GIC_SPI 389 IRQ_TYPE_LEVEL_HIGH /* CE0 */ >,
-			     <GIC_SPI 413 IRQ_TYPE_LEVEL_HIGH /* CE1 */ >,
-			     <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH /* CE2 */ >,
-			     <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH /* CE3 */ >,
-			     <GIC_SPI 434 IRQ_TYPE_LEVEL_HIGH /* CE4 */ >,
-			     <GIC_SPI 435 IRQ_TYPE_LEVEL_HIGH /* CE5 */ >,
-			     <GIC_SPI 438 IRQ_TYPE_LEVEL_HIGH /* CE6 */ >,
-			     <GIC_SPI 439 IRQ_TYPE_LEVEL_HIGH /* CE7 */ >,
-			     <GIC_SPI 440 IRQ_TYPE_LEVEL_HIGH /* CE8 */ >,
-			     <GIC_SPI 451 IRQ_TYPE_LEVEL_HIGH /* CE9 */ >,
-			     <GIC_SPI 453 IRQ_TYPE_LEVEL_HIGH /* CE10 */ >,
-			     <GIC_SPI 454 IRQ_TYPE_LEVEL_HIGH /* CE11 */ >;
-		qcom,iommu-dma = "fastmap";
-		qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal";
-		qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>;
-		qcom,iommu-geometry = <0xa0000000 0x10000000>;
-		qcom,fw-prefix;
-		qcom,wlan;
-		bdf-download-support;
-		wpss-support-enable;
-		qcom,wlan-msa-fixed-region = <&wlan_msa_mem>;
-		vdd-cx-mx-supply = <&L11B>;
-		vdd-1.8-xo-supply = <&L23B>;
-		vdd-1.3-rfa-supply = <&L14B>;
-		vdd-3.3-ch0-supply = <&L7E>;
-		qcom,vdd-cx-mx-config = <0 0>;
-		qcom,vdd-3.3-ch0-config = <3000000 3312000>;
-
-		qcom,smem-states = <&smp2p_wlan_1_out 0>;
-		qcom,smem-state-names = "wlan-smp2p-out";
-
-		qcom,smp2p_map_wlan_1_in {
-			interrupts-extended = <&smp2p_wlan_1_in 0 0>,
-					      <&smp2p_wlan_1_in 1 0>;
-			interrupt-names = "qcom,smp2p-force-fatal-error",
-					  "qcom,smp2p-early-crash-ind";
-		};
-
-	};
-
 	thermal_zones: thermal-zones {
 	};
 
diff --git a/qcom/ravelinp-idp.dts b/qcom/ravelinp-idp.dts
index 66ff9807..6adcb5bb 100644
--- a/qcom/ravelinp-idp.dts
+++ b/qcom/ravelinp-idp.dts
@@ -1,6 +1,7 @@
 /dts-v1/;
 
 #include "ravelinp.dtsi"
+#include "ravelin-adrastea.dtsi"
 #include "ravelinp-idp.dtsi"
 
 / {