diff --git a/tuna-audio-cdp.dtsi b/tuna-audio-cdp.dtsi
index 1f254184..31e7cff7 100644
--- a/tuna-audio-cdp.dtsi
+++ b/tuna-audio-cdp.dtsi
@@ -33,10 +33,26 @@
 	status = "disabled";
 };
 
+&wcd9378_rx_slave {
+	status = "disabled";
+};
+
+&wcd9378_tx_slave {
+	status = "disabled";
+};
+
 &wcd939x_codec {
 	status = "okay";
 };
 
+&wcd939x_tx_slave {
+	status = "okay";
+};
+
+&wcd939x_rx_slave {
+	status = "okay";
+};
+
 &swr0 {
 	wsa884x_0220: wsa884x@02170220 {
 		status = "okay";
diff --git a/tuna-audio-overlay.dtsi b/tuna-audio-overlay.dtsi
index 1d146e13..38cfbaee 100644
--- a/tuna-audio-overlay.dtsi
+++ b/tuna-audio-overlay.dtsi
@@ -440,8 +440,6 @@
 			"AMIC3", "MIC BIAS3",
 			"AMIC4", "Analog Mic4",
 			"AMIC4", "MIC BIAS3",
-			"AMIC5", "Analog Mic5",
-			"AMIC5", "MIC BIAS4",
 			"VA AMIC1", "Analog Mic1",
 			"VA AMIC1", "VA MIC BIAS1",
 			"VA AMIC2", "Analog Mic2",
@@ -450,8 +448,6 @@
 			"VA AMIC3", "VA MIC BIAS3",
 			"VA AMIC4", "Analog Mic4",
 			"VA AMIC4", "VA MIC BIAS3",
-			"VA AMIC5", "Analog Mic5",
-			"VA AMIC5", "VA MIC BIAS4",
 			"TX DMIC0", "Digital Mic0",
 			"TX DMIC0", "MIC BIAS3",
 			"TX DMIC1", "Digital Mic1",
diff --git a/tuna-audio-qrd.dtsi b/tuna-audio-qrd.dtsi
index 5cb9ac46..da712522 100644
--- a/tuna-audio-qrd.dtsi
+++ b/tuna-audio-qrd.dtsi
@@ -39,14 +39,30 @@
 	};
 };
 
-&wsa_macro {
-	qcom,wsa-bat-cfgs = <1>, <1>;
-};
-
 &wcd9378_codec {
 	status = "disabled";
 };
 
+&wcd9378_rx_slave {
+	status = "disabled";
+};
+
+&wcd9378_tx_slave {
+	status = "disabled";
+};
+
+&wcd939x_tx_slave {
+	status = "okay";
+};
+
+&wcd939x_rx_slave {
+	status = "okay";
+};
+
+&wsa_macro {
+	qcom,wsa-bat-cfgs = <1>, <1>;
+};
+
 &wcd939x_codec {
 	status = "okay";
 	/* 0 for digital crosstalk disabled,