diff --git a/pineapple-audio-cdp.dtsi b/pineapple-audio-cdp.dtsi
index e98cf2c9..a41aac27 100644
--- a/pineapple-audio-cdp.dtsi
+++ b/pineapple-audio-cdp.dtsi
@@ -99,7 +99,6 @@
 		"IN1_HPHL", "HPHL_OUT",
 		"IN2_HPHR", "HPHR_OUT",
 		"IN3_EAR",  "AUX_OUT",
-		"HAP_IN", "PCM_OUT",
 		"WSA SRC0_INP", "SRC0",
 		"WSA_TX DEC0_INP", "TX DEC0 MUX",
 		"WSA_TX DEC1_INP", "TX DEC1 MUX",
diff --git a/pineapple-audio-overlay.dtsi b/pineapple-audio-overlay.dtsi
index 69a1abbe..9842d780 100644
--- a/pineapple-audio-overlay.dtsi
+++ b/pineapple-audio-overlay.dtsi
@@ -165,6 +165,7 @@
 				reg = <0x02 0xf0170220>;
 				swr-slave-supply = <&hap_swr_slave_reg>;
 				qcom,rx_swr_ch_map = <0 0x01 0x01 0 PCM_OUT1>;
+				status = "disabled";
 			};
 
 			wcd939x_rx_slave: wcd939x-rx-slave {
@@ -408,8 +409,8 @@
 		qcom,model = "pineapple-mtp-snd-card";
 		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
 		qcom,mi2s-tdm-is-hw-vote-needed = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
-		qcom,wcn-bt = <1>;
-		qcom,ext-disp-audio-rx = <1>;
+		qcom,wcn-bt = <0>;
+		qcom,ext-disp-audio-rx = <0>;
 		qcom,tdm-max-slots = <8>;
 		qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
 		qcom,mi2s-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
@@ -446,7 +447,6 @@
 			"IN1_HPHL", "HPHL_OUT",
 			"IN2_HPHR", "HPHR_OUT",
 			"IN3_EAR", "AUX_OUT",
-			"HAP_IN", "PCM_OUT",
 			"WSA SRC0_INP", "SRC0",
 			"WSA_TX DEC0_INP", "TX DEC0 MUX",
 			"WSA_TX DEC1_INP", "TX DEC1 MUX",
@@ -809,4 +809,4 @@
 
 &adsp_loader {
 	status = "ok";
-};
\ No newline at end of file
+};
diff --git a/pineapple-audio-qrd.dtsi b/pineapple-audio-qrd.dtsi
index c213da43..23137925 100644
--- a/pineapple-audio-qrd.dtsi
+++ b/pineapple-audio-qrd.dtsi
@@ -84,7 +84,6 @@
 		"IN1_HPHL", "HPHL_OUT",
 		"IN2_HPHR", "HPHR_OUT",
 		"IN3_EAR", "AUX_OUT",
-		"HAP_IN", "PCM_OUT",
 		"WSA SRC0_INP", "SRC0",
 		"WSA_TX DEC0_INP", "TX DEC0 MUX",
 		"WSA_TX DEC1_INP", "TX DEC1 MUX",