diff --git a/sun-audio-hamilton-mtp.dtsi b/sun-audio-hamilton-mtp.dtsi
index 87fe4155..0137bc09 100644
--- a/sun-audio-hamilton-mtp.dtsi
+++ b/sun-audio-hamilton-mtp.dtsi
@@ -11,5 +11,7 @@
 
 &sun_snd {
 	qcom,model = "sun-mtp-wsa883x-snd-card";
+	qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>,
+				<&lpass_cdc>;
 };
 
diff --git a/sun-audio-mtp-qmp.dtsi b/sun-audio-mtp-qmp.dtsi
index bf53f3cf..df85e70b 100644
--- a/sun-audio-mtp-qmp.dtsi
+++ b/sun-audio-mtp-qmp.dtsi
@@ -21,6 +21,11 @@
 				<OFFSET1_VAL1 LANE0>, <OFFSET1_VAL2 LANE0>,
 				<OFFSET1_VAL1 LANE0>, <OFFSET1_VAL2 LANE0>,
 				<OFFSET1_VAL1 LANE0>, <OFFSET1_VAL2 LANE0>;
+		reg-values = <0x401805B0 0x5
+				  0x401805B1 0x5
+				  0x401805B2 0x5
+				  0x401805B3 0x5
+				  0x401805B8 0x5>;
 	};
 
 	qmp02: qmp@04170236 {
@@ -34,6 +39,11 @@
 				<OFFSET1_VAL2 LANE0>, <OFFSET1_VAL1 LANE0>,
 				<OFFSET1_VAL2 LANE0>, <OFFSET1_VAL1 LANE0>,
 				<OFFSET1_VAL2 LANE0>, <OFFSET1_VAL1 LANE0>;
+		reg-values = <0x401805B0 0x5
+				  0x401805B1 0x5
+				  0x401805B2 0x5
+				  0x401805B3 0x5
+				  0x401805B8 0x5>;
 	};
 
 	qmp03: qmp@04170230 {
@@ -47,6 +57,11 @@
 				<OFFSET1_VAL3 LANE0>, <OFFSET1_VAL2 LANE0>,
 				<OFFSET1_VAL3 LANE0>, <OFFSET1_VAL2 LANE0>,
 				<OFFSET1_VAL3 LANE0>, <OFFSET1_VAL2 LANE0>;
+		reg-values = <0x401805B0 0x5
+				  0x401805B1 0x5
+				  0x401805B2 0x5
+				  0x401805B3 0x5
+				  0x401805B8 0x5>;
 	};
 
 	qmp04: qmp@04170239 {
@@ -60,6 +75,11 @@
 				<OFFSET1_VAL1 LANE0>, <OFFSET1_VAL2 LANE0>,
 				<OFFSET1_VAL1 LANE0>, <OFFSET1_VAL2 LANE0>,
 				<OFFSET1_VAL1 LANE0>, <OFFSET1_VAL2 LANE0>;
+		reg-values = <0x401805B0 0x5
+				  0x401805B1 0x5
+				  0x401805B2 0x5
+				  0x401805B3 0x5
+				  0x401805B8 0x5>;
 	};
 };
 
diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi
index 4b193856..62c4968a 100644
--- a/sun-audio-overlay.dtsi
+++ b/sun-audio-overlay.dtsi
@@ -288,6 +288,7 @@
 				reg = <0x03 0xf0170220>;
 				swr-slave-supply = <&hap_swr_slave_reg>;
 				qcom,rx_swr_ch_map = <0 0x01 0x01 0 OCPM>;
+				qcom,rx_swr_vi_ch_map = <2 0x02 0x03 1200000 SPKR_L_VI>;
 			};
 		};
 	};
@@ -410,7 +411,7 @@
 	sun_snd: sound {
 		qcom,model = "sun-mtp-snd-card";
 		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
-		qcom,mi2s-tdm-is-hw-vote-needed = <1>, <0>, <1>, <0>, <1>, <0>, <0>;
+		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,tdm-max-slots = <8>;
diff --git a/sun-audio-qrd.dtsi b/sun-audio-qrd.dtsi
index d09a730f..45dc7497 100644
--- a/sun-audio-qrd.dtsi
+++ b/sun-audio-qrd.dtsi
@@ -45,7 +45,7 @@
 	 * 1 for digital crosstalk with local sensed a-xtalk enabled, and
 	 * 2 for digital crosstalk with remote sensed a-xtalk enabled.
 	 */
-	qcom,usbcss-hs-xtalk-config = <2>;
+	qcom,usbcss-hs-xtalk-config = <0>;
 	qcom,usbcss-hs-rdson = <600>;
 	qcom,usbcss-hs-r2 = <7550>;
 	qcom,usbcss-hs-r3 = <1>;
diff --git a/sun-audio.dtsi b/sun-audio.dtsi
index 50e77c5b..4890caf6 100644
--- a/sun-audio.dtsi
+++ b/sun-audio.dtsi
@@ -45,6 +45,7 @@
 
 		audio_prm: q6prm {
 			compatible = "qcom,audio_prm";
+			qcom,sleep-api-supported = <1>;
 			reg = <GPR_SVC_ASM>;
 		};
 	};