arm64: dts: allwinner: a64: Allow multiple DAI links

simple-audio-card supports either a single DAI link at the top level, or
subnodes with one or more DAI links. To use the secondary AIFs on the
codec, we need to add additional DAI links to the same sound card, so we
need to use the other binding.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20210430035859.3487-6-samuel@sholland.org

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 34bb455c0f07d6fa4b2b26ee75b1cb3859cb52b6..6ddb717f2f980513919c10e52e211e1ccbb7b5f4 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -131,12 +131,10 @@
        };
 
        sound: sound {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "simple-audio-card";
                simple-audio-card,name = "sun50i-a64-audio";
-               simple-audio-card,format = "i2s";
-               simple-audio-card,frame-master = <&cpudai>;
-               simple-audio-card,bitclock-master = <&cpudai>;
-               simple-audio-card,mclk-fs = <128>;
                simple-audio-card,aux-devs = <&codec_analog>;
                simple-audio-card,routing =
                                "Left DAC", "DACL",
@@ -145,12 +143,19 @@
                                "ADCR", "Right ADC";
                status = "disabled";
 
-               cpudai: simple-audio-card,cpu {
-                       sound-dai = <&dai>;
-               };
+               simple-audio-card,dai-link@0 {
+                       format = "i2s";
+                       frame-master = <&link0_cpu>;
+                       bitclock-master = <&link0_cpu>;
+                       mclk-fs = <128>;
 
-               link_codec: simple-audio-card,codec {
-                       sound-dai = <&codec 0>;
+                       link0_cpu: cpu {
+                               sound-dai = <&dai>;
+                       };
+
+                       link0_codec: codec {
+                               sound-dai = <&codec 0>;
+                       };
                };
        };