diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi
index 9407fe9d..dc9c7340 100644
--- a/sun-audio-overlay.dtsi
+++ b/sun-audio-overlay.dtsi
@@ -389,24 +389,24 @@
 	clocks = <&clock_audio_bt_swr_mclk_clk 0>, <&clock_audio_bt_swr_mclk_clk_2x 0>,
 			<&lpass_core_hw_vote 0>, <&lpass_audio_hw_vote 0>;
 	qcom,bt-swr-gpios = <&bt_swr_gpios>;
+};
 
-	swr4: bt_swr_mstr {
-		compatible = "qcom,swr-mstr";
-		qcom,swr_master_id = <5>;
-		clock-names = "lpass_core_hw_vote",
-				"lpass_audio_hw_vote";
-		clocks = <&lpass_core_hw_vote 0>,
-				<&lpass_audio_hw_vote 0>;
-		swrm-io-base = <0x06CA0000 0x0>;
-		interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "swr_master_irq";
-		qcom,swr-num-ports = <7>;
-		qcom,swr-port-mapping = <1 BT_AUDIO_RX1 0x3>,
-			<2 BT_AUDIO_RX2 0x3>, <3 BT_AUDIO_RX3 0x3>,
-			<5 BT_AUDIO_TX1 0x3>, <6 BT_AUDIO_TX2 0x3>,
-			<7 BT_AUDIO_TX3 0x3>, <8 FM_AUDIO_TX1 0x3>;
-		qcom,swr-num-dev = <1>;
-	};
+&swr4 {
+	compatible = "qcom,swr-mstr";
+	qcom,swr_master_id = <5>;
+	clock-names = "lpass_core_hw_vote",
+			"lpass_audio_hw_vote";
+	clocks = <&lpass_core_hw_vote 0>,
+			<&lpass_audio_hw_vote 0>;
+	swrm-io-base = <0x06CA0000 0x0>;
+	interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
+	interrupt-names = "swr_master_irq";
+	qcom,swr-num-ports = <7>;
+	qcom,swr-port-mapping = <1 BT_AUDIO_RX1 0x3>,
+		<2 BT_AUDIO_RX2 0x3>, <3 BT_AUDIO_RX3 0x3>,
+		<5 BT_AUDIO_TX1 0x3>, <6 BT_AUDIO_TX2 0x3>,
+		<7 BT_AUDIO_TX3 0x3>, <8 FM_AUDIO_TX1 0x3>;
+	qcom,swr-num-dev = <1>;
 };
 
 &spf_core_platform  {
diff --git a/sun-audio.dtsi b/sun-audio.dtsi
index a6a18ab3..b55cb8cb 100644
--- a/sun-audio.dtsi
+++ b/sun-audio.dtsi
@@ -30,6 +30,7 @@
 		compatible = "qcom,gpr";
 		qcom,glink-channels = "adsp_apps";
 		qcom,intents = <0x200 20>;
+		qcom,ch-sched-rt;
 		reg = <GPR_DOMAIN_ADSP>;
 
 		spf_core {