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 42c8698..a416bb5 100644 (file)
--- 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 a210af0..22143c7 100644 (file)
--- 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 98a9df5..5679944 100644 (file)
--- 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 8a20af4..901231b 100644 (file)
--- 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 cac5436..ac6f7ea 100644 (file)
--- 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 {\r
-\r
-        simple-audio-card,dai-link@1 {\r
-                reg = <0>;\r
-                format = "left_j";\r
-                bitclock-master = <&sndcpu0>;\r
-                frame-master = <&sndcpu0>;\r
-                status = "okay";\r
-\r
-                sndcpu0: cpu {\r
-                        sound-dai = <&spdif0>;\r
-                };\r
-\r
-                codec {\r
-                        sound-dai = <&spdif_transmitter>;\r
-                };\r
-        };\r
-\r
-};\r
+&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 02f8d2b..30dad6a 100644 (file)
--- 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 025735d..3b96684 100644 (file)
--- 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 0dcba86..d6c684c 100644 (file)
--- 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>;
                };