From 3517f0754ca3c54bc0de0a512219c96d48eaaae5 Mon Sep 17 00:00:00 2001
From: Xing Zheng <zhengxing@rock-chips.com>
Date: Fri, 24 Mar 2023 20:37:58 +0800
Subject: [PATCH] ARM: dts: rockchip: rk3128-evb-ddr3-v10-linux: add support
 hdmi sound via SPDIF source

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I47a0e5943349ae12b8ea12cfa78fddd655c6f2aa
---
 .../boot/dts/rk3128-evb-ddr3-v10-linux.dts    | 59 +++++++++----------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/arch/arm/boot/dts/rk3128-evb-ddr3-v10-linux.dts b/arch/arm/boot/dts/rk3128-evb-ddr3-v10-linux.dts
index 8f7d39e21440..1fa33db4f9e4 100644
--- a/arch/arm/boot/dts/rk3128-evb-ddr3-v10-linux.dts
+++ b/arch/arm/boot/dts/rk3128-evb-ddr3-v10-linux.dts
@@ -83,37 +83,16 @@
 		reset-gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_LOW>;
 	};
 
-	sound: sound {
+	codec_sound: codec-sound {
 		compatible = "simple-audio-card";
 		simple-audio-card,format = "i2s";
 		simple-audio-card,name = "rockchip,rk312x-codec";
 		simple-audio-card,mclk-fs = <256>;
-		simple-audio-card,widgets =
-			"Headphone", "Headphone Jack";
-		simple-audio-card,routing =
-			"Headphone Jack", "HPOL",
-			"Headphone Jack", "HPOR";
-
-		simple-audio-card,dai-link@0 {
-			format = "i2s";
-			cpu {
-				sound-dai = <&i2s_8ch 0>;
-			};
-
-			codec {
-				sound-dai = <&codec>;
-			};
+		simple-audio-card,cpu {
+			sound-dai = <&i2s_8ch>;
 		};
-
-		simple-audio-card,dai-link@1 {
-			format = "i2s";
-			cpu {
-				sound-dai = <&i2s_8ch 1>;
-			};
-
-			codec {
-				sound-dai = <&hdmi>;
-			};
+		simple-audio-card,codec {
+			sound-dai = <&codec>;
 		};
 	};
 
@@ -123,16 +102,31 @@
 		#sound-dai-cells = <0>;
 	};
 
-	spdif_sound: spdif-sound {
+	media_sound: media-sound {
 		status = "okay";
 		compatible = "simple-audio-card";
-		simple-audio-card,name = "ROCKCHIP,SPDIF";
+		simple-audio-card,name = "rockchip,hdmi-spdif";
 		simple-audio-card,mclk-fs = <128>;
-		simple-audio-card,cpu {
-			sound-dai = <&spdif>;
+		simple-audio-card,dai-link@0 {
+			format = "spdif";
+			cpu {
+				sound-dai = <&spdif>;
+			};
+
+			codec {
+				sound-dai = <&spdif_out>;
+			};
 		};
-		simple-audio-card,codec {
-			sound-dai = <&spdif_out>;
+
+		simple-audio-card,dai-link@1 {
+			format = "spdif";
+			cpu {
+				sound-dai = <&spdif>;
+			};
+
+			codec {
+				sound-dai = <&hdmi>;
+			};
 		};
 	};
 
@@ -579,6 +573,7 @@
 };
 
 &hdmi {
+	rockchip,format = "spdif";
 	#sound-dai-cells = <0>;
 	status = "okay";
 };