From: Xingyu Wu <xingyu.wu@starfivetech.com>
Date: Tue, 6 Dec 2022 03:19:51 +0000 (+0800)
Subject: riscv: dts: starfive: jh7110: Add multiple sound cards
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd20de9a3661420c07075d9cf8c95fbf6bb08755;p=platform%2Fkernel%2Flinux-starfive.git

riscv: dts: starfive: jh7110: Add multiple sound cards

Add multiple sound cards to let one device corresponds to
one sound card.

Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com>
---

diff --git a/arch/riscv/boot/dts/starfive/codecs/sf_ac108.dtsi b/arch/riscv/boot/dts/starfive/codecs/sf_ac108.dtsi
index 42c8698bc3af..a416bb52698d 100644
--- a/arch/riscv/boot/dts/starfive/codecs/sf_ac108.dtsi
+++ b/arch/riscv/boot/dts/starfive/codecs/sf_ac108.dtsi
@@ -1,4 +1,4 @@
-&sound {
+&sound0 {
 	/* i2s + ac108 */
 	simple-audio-card,dai-link@0 {
 		reg = <0>;
diff --git a/arch/riscv/boot/dts/starfive/codecs/sf_hdmi.dtsi b/arch/riscv/boot/dts/starfive/codecs/sf_hdmi.dtsi
index a210af0511fc..22143c76ec3d 100644
--- a/arch/riscv/boot/dts/starfive/codecs/sf_hdmi.dtsi
+++ b/arch/riscv/boot/dts/starfive/codecs/sf_hdmi.dtsi
@@ -1,6 +1,6 @@
-&sound {
+&sound1 {
 	/* i2s + hdmi */
-	simple-audio-card,dai-link@2 {
+	simple-audio-card,dai-link@0 {
 		reg = <0>;
 		format = "i2s";
 		bitclock-master = <&sndi2s0>;
diff --git a/arch/riscv/boot/dts/starfive/codecs/sf_pdm.dtsi b/arch/riscv/boot/dts/starfive/codecs/sf_pdm.dtsi
index 98a9df535c6a..56799441cd12 100644
--- a/arch/riscv/boot/dts/starfive/codecs/sf_pdm.dtsi
+++ b/arch/riscv/boot/dts/starfive/codecs/sf_pdm.dtsi
@@ -1,4 +1,4 @@
-&sound{
+&sound2 {
 	simple-audio-card,dai-link@0 {
 		reg = <0>;
 		status = "okay";
diff --git a/arch/riscv/boot/dts/starfive/codecs/sf_pwmdac.dtsi b/arch/riscv/boot/dts/starfive/codecs/sf_pwmdac.dtsi
index 8a20af47465e..901231b93313 100644
--- a/arch/riscv/boot/dts/starfive/codecs/sf_pwmdac.dtsi
+++ b/arch/riscv/boot/dts/starfive/codecs/sf_pwmdac.dtsi
@@ -1,5 +1,5 @@
-&sound {                
-	simple-audio-card,dai-link@1 {
+&sound3 {
+	simple-audio-card,dai-link@0 {
 		reg = <0>;
 		format = "left_j";
 		bitclock-master = <&sndcpu0>;
diff --git a/arch/riscv/boot/dts/starfive/codecs/sf_spdif.dtsi b/arch/riscv/boot/dts/starfive/codecs/sf_spdif.dtsi
index cac543638a1a..ac6f7ea8b0d6 100644
--- a/arch/riscv/boot/dts/starfive/codecs/sf_spdif.dtsi
+++ b/arch/riscv/boot/dts/starfive/codecs/sf_spdif.dtsi
@@ -1,19 +1,17 @@
-&sound {
-
-        simple-audio-card,dai-link@1 {
-                reg = <0>;
-                format = "left_j";
-                bitclock-master = <&sndcpu0>;
-                frame-master = <&sndcpu0>;
-                status = "okay";
-
-                sndcpu0: cpu {
-                        sound-dai = <&spdif0>;
-                };
-
-                codec {
-                        sound-dai = <&spdif_transmitter>;
-                };
-        };
-
-};
+&sound4 {
+	simple-audio-card,dai-link@0 {
+		reg = <0>;
+		format = "left_j";
+		bitclock-master = <&sndcpu0>;
+		frame-master = <&sndcpu0>;
+		status = "okay";
+
+		sndcpu0: cpu {
+			sound-dai = <&spdif0>;
+		};
+
+		codec {
+			sound-dai = <&spdif_transmitter>;
+		};
+	};
+};
diff --git a/arch/riscv/boot/dts/starfive/codecs/sf_tdm.dtsi b/arch/riscv/boot/dts/starfive/codecs/sf_tdm.dtsi
index 02f8d2bc4155..30dad6aad961 100644
--- a/arch/riscv/boot/dts/starfive/codecs/sf_tdm.dtsi
+++ b/arch/riscv/boot/dts/starfive/codecs/sf_tdm.dtsi
@@ -1,4 +1,4 @@
-&sound{
+&sound5 {
 	simple-audio-card,dai-link@0 {
 		reg = <0>;
 		status = "okay";
diff --git a/arch/riscv/boot/dts/starfive/codecs/sf_wm8960.dtsi b/arch/riscv/boot/dts/starfive/codecs/sf_wm8960.dtsi
index 025735d1a92c..3b9668488097 100644
--- a/arch/riscv/boot/dts/starfive/codecs/sf_wm8960.dtsi
+++ b/arch/riscv/boot/dts/starfive/codecs/sf_wm8960.dtsi
@@ -1,6 +1,6 @@
-&sound{
+&sound6 {
 	/* i2s + wm8960 */
-	simple-audio-card,dai-link@1 {
+	simple-audio-card,dai-link@0 {
 		reg = <0>;
 		status = "okay";
 		format = "i2s";
diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index 0dcba863e9fc..d6c684c0e130 100644
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -1681,9 +1681,51 @@
 			#sound-dai-cells = <0>;
 		};
 
-		sound: snd-card {
+		sound0: snd-card0 {
 			compatible = "simple-audio-card";
-			simple-audio-card,name = "Starfive-Multi-Sound-Card";
+			simple-audio-card,name = "Starfive-AC108-Sound-Card";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		sound1: snd-card1 {
+			compatible = "simple-audio-card";
+			simple-audio-card,name = "Starfive-HDMI-Sound-Card";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		sound2: snd-card2 {
+			compatible = "simple-audio-card";
+			simple-audio-card,name = "Starfive-PDM-Sound-Card";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		sound3: snd-card3 {
+			compatible = "simple-audio-card";
+			simple-audio-card,name = "Starfive-PWMDAC-Sound-Card";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		sound4: snd-card4 {
+			compatible = "simple-audio-card";
+			simple-audio-card,name = "Starfive-SPDIF-Sound-Card";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		sound5: snd-card5 {
+			compatible = "simple-audio-card";
+			simple-audio-card,name = "Starfive-TDM-Sound-Card";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		sound6: snd-card6 {
+			compatible = "simple-audio-card";
+			simple-audio-card,name = "Starfive-WM8960-Sound-Card";
 			#address-cells = <1>;
 			#size-cells = <0>;
 		};