From b5f3638150c0e6e89ecdb14e9e3ceb83e5d16b9a Mon Sep 17 00:00:00 2001
From: "195375690@qq.com" <195375690@qq.com>
Date: Wed, 3 Apr 2024 20:28:14 +0800
Subject: [PATCH] use simple-audio-card for hdmi sound for rk3528

---
 .../boot/dts/rockchip/rk3528-hinlink-ht2.dts   | 18 +++++++++++-------
 .../boot/dts/rockchip/rk3528-mangopi-m28k.dts  | 17 +++++++++++------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3528-hinlink-ht2.dts b/arch/arm64/boot/dts/rockchip/rk3528-hinlink-ht2.dts
index eb05fa33da03e..c3701ce8124ed 100644
--- a/arch/arm64/boot/dts/rockchip/rk3528-hinlink-ht2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3528-hinlink-ht2.dts
@@ -220,14 +220,18 @@
 	};
 	
 	hdmi_sound: hdmi-sound {
-		compatible = "rockchip,hdmi";
-		rockchip,mclk-fs = <128>;
-		rockchip,card-name = "rockchip,hdmi";
-		rockchip,cpu = <&sai3>;
-		rockchip,codec = <&hdmi>;
-		rockchip,jack-det;
+	        status = "okay";
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,name = "rockchip-hdmi0";
+		simple-audio-card,cpu {
+			sound-dai = <&sai3>;
+		};
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
 	};
-
 	sdio_pwrseq: sdio-pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		pinctrl-names = "default";
diff --git a/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k.dts b/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k.dts
index cf6440d6ab458..5ba8fd86a330a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k.dts
@@ -220,12 +220,17 @@
 	};
 	
 	hdmi_sound: hdmi-sound {
-		compatible = "rockchip,hdmi";
-		rockchip,mclk-fs = <128>;
-		rockchip,card-name = "rockchip,hdmi";
-		rockchip,cpu = <&sai3>;
-		rockchip,codec = <&hdmi>;
-		rockchip,jack-det;
+	        status = "okay";
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,name = "rockchip-hdmi0";
+		simple-audio-card,cpu {
+			sound-dai = <&sai3>;
+		};
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
 	};
 
 	sdio_pwrseq: sdio-pwrseq {