diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10-partybox.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10-partybox.dts
index 348724cea13e..c96655e59634 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10-partybox.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10-partybox.dts
@@ -25,6 +25,10 @@
 	rockchip,adc-grps-route = <0 1 2 3>;
 };
 
+&bluetooth_sound {
+	status = "disabled";
+};
+
 &cpu0_opp_table {
 	opp-408000000 {
 		status = "disabled";
@@ -54,3 +58,16 @@
 		status = "okay";
 	};
 };
+
+&spdif_rx {
+	status = "okay";
+};
+
+&spdif_rx_sound {
+	status = "okay";
+	rockchip,wait-card-locked = <0>;
+};
+
+&vad_acodec_sound {
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10.dtsi
index c2a9ea41a012..b8e2e81c6784 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10.dtsi
@@ -10,6 +10,7 @@
 	/delete-node/ wireless-wlan;
 	/delete-node/ wireless-bluetooth;
 	/delete-node/ gpio-keys;
+	/delete-node/ tas5731_sound;
 
 	wireless-wlan {
 		compatible = "wlan-platdata";
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
index 3e1e1ae204ab..f6a6febe2e64 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
@@ -88,6 +88,7 @@
 	};
 
 	acodec_sound: acodec-sound {
+		status = "disabled";
 		compatible = "rockchip,multicodecs-card";
 		rockchip,card-name = "rockchip,rk3308-acodec";
 		rockchip,codec-hp-det;
@@ -108,29 +109,27 @@
 		rockchip,wait-card-locked = <0>;
 	};
 
+	spdif_dummy_codec: spdif-dummy-codec {
+		compatible = "rockchip,dummy-codec";
+		#sound-dai-cells = <0>;
+	};
+
 	spdif_rx_sound: spdif-rx-sound {
 		status = "disabled";
-		compatible = "simple-audio-card";
-		simple-audio-card,name = "rockchip,spdif-rx-sound";
-		simple-audio-card,mclk-fs = <128>;
-		simple-audio-card,cpu {
-			sound-dai = <&spdif_rx>;
-		};
-		simple-audio-card,codec {
-			sound-dai = <&dummy_codec>;
-		};
+		compatible = "rockchip,multicodecs-card";
+		rockchip,card-name = "rockchip,spdif-rx";
+		rockchip,mclk-fs = <128>;
+		rockchip,cpu = <&spdif_rx>;
+		rockchip,codec = <&dummy_codec>;
 	};
 
 	spdif_tx_sound: spdif-tx-sound {
 		status = "disabled";
-		compatible = "simple-audio-card";
-		simple-audio-card,name = "rockchip,spdif-tx-sound";
-		simple-audio-card,cpu {
-			sound-dai = <&spdif_tx>;
-		};
-		simple-audio-card,codec {
-			sound-dai = <&dummy_codec>;
-		};
+		compatible = "rockchip,multicodecs-card";
+		rockchip,card-name = "rockchip,spdif-tx";
+		rockchip,mclk-fs = <128>;
+		rockchip,cpu = <&spdif_tx>;
+		rockchip,codec = <&spdif_dummy_codec>;
 	};
 
 	tas5731_sound: tas5731-sound {
@@ -767,6 +766,16 @@
 	status = "disabled";
 };
 
+&spdif_rx {
+	status = "disabled";
+	#sound-dai-cells = <0>;
+};
+
+&spdif_tx {
+	status = "disabled";
+	#sound-dai-cells = <0>;
+};
+
 &tsadc {
 	rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */
 	rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */