diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi
index 16e05396175c..8a1dc80375e8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi
@@ -35,7 +35,7 @@
 		compatible = "simple-audio-card";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,mclk-fs = <256>;
-		simple-audio-card,name = "rockchip,i2s1-sound";
+		simple-audio-card,name = "rockchip-i2s1";
 		simple-audio-card,cpu {
 			sound-dai = <&i2s1_8ch>;
 		};
@@ -44,6 +44,16 @@
 		};
 	};
 
+	rk618_hdmi_sound: rk618-hdmi-sound {
+		status = "okay";
+		compatible = "rockchip,hdmi";
+		rockchip,mclk-fs = <128>;
+		rockchip,card-name = "rk618-hdmi";
+		rockchip,cpu = <&spdif_8ch>;
+		rockchip,codec = <&rk618_hdmi>;
+		rockchip,jack-det;
+	};
+
 	vcc2v5_sys: vcc2v5-ddr {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc2v5-sys";
@@ -230,7 +240,7 @@
 			status = "okay";
 		};
 
-		hdmi {
+		rk618_hdmi: hdmi {
 			compatible = "rockchip,rk618-hdmi";
 			clocks = <&clock HDMI_CLK>;
 			clock-names = "hdmi";
@@ -238,6 +248,8 @@
 			assigned-clock-parents = <&clock VIF0_CLK>;
 			interrupt-parent = <&gpio0>;
 			interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
+			rockchip,format = "spdif";
+			#sound-dai-cells = <0>;
 			status = "okay";
 
 			ports {
@@ -420,6 +432,20 @@
 	status = "okay";
 };
 
+&spdif_out {
+	status = "disabled";
+};
+
+&spdif_sound {
+	status = "disabled";
+};
+
+&spdif_8ch {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&spdifm1_tx>;
+};
+
 &pinctrl {
 	rk618 {
 		rk618_reset: rk618-reeset {
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi
index d0f1869720a4..c82fbefd2436 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi
@@ -51,10 +51,10 @@
 		rockchip,jack-det;
 	};
 
-	spdif-sound {
+	spdif_sound: spdif-sound {
 		status = "okay";
 		compatible = "simple-audio-card";
-		simple-audio-card,name = "ROCKCHIP,SPDIF";
+		simple-audio-card,name = "ROCKCHIP-SPDIF";
 		simple-audio-card,cpu {
 				sound-dai = <&spdif_8ch>;
 		};