arm64: dts: renesas: ulcb/ulcb-kf: switch to use audio-graph-card2 for sound

Current ULCB{-KF} are using audio-graph-card.
Now ALSA is supporting new audio-graph-card2 which can easily handle
more advanced feature. Let's switch to use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/20220124021142.224592-2-kuninori.morimoto.gx@renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
index 30f1855..889d117 100644 (file)
--- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
@@ -419,12 +419,9 @@
                        reg = <2>;
                        rsnd_for_pcm3168a_play: endpoint {
                                remote-endpoint = <&pcm3168a_endpoint_p>;
-
-                               dai-format = "i2s";
-                               bitclock-master = <&rsnd_for_pcm3168a_play>;
-                               frame-master = <&rsnd_for_pcm3168a_play>;
+                               bitclock-master;
+                               frame-master;
                                dai-tdm-slot-num = <8>;
-
                                playback = <&ssi3>;
                        };
                };
@@ -432,12 +429,9 @@
                        reg = <3>;
                        rsnd_for_pcm3168a_capture: endpoint {
                                remote-endpoint = <&pcm3168a_endpoint_c>;
-
-                               dai-format = "i2s";
-                               bitclock-master = <&rsnd_for_pcm3168a_capture>;
-                               frame-master = <&rsnd_for_pcm3168a_capture>;
+                               bitclock-master;
+                               frame-master;
                                dai-tdm-slot-num = <6>;
-
                                capture  = <&ssi4>;
                        };
                };
@@ -477,10 +471,10 @@
 };
 
 &sound_card {
-       dais = <&rsnd_port0     /* ak4613 */
-               &rsnd_port1     /* HDMI0  */
-               &rsnd_port2     /* pcm3168a playback */
-               &rsnd_port3     /* pcm3168a capture  */
+       links = <&rsnd_port0    /* ak4613 */
+                &rsnd_port1    /* HDMI0  */
+                &rsnd_port2    /* pcm3168a playback */
+                &rsnd_port3    /* pcm3168a capture  */
                >;
 };
 

diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi
index a7e93df..b4bdb2d 100644 (file)
--- a/arch/arm64/boot/dts/renesas/ulcb.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi
@@ -95,11 +95,11 @@
        };
 
        sound_card: sound {
-               compatible = "audio-graph-card";
+               compatible = "audio-graph-card2";
                label = "rcar-sound";
 
-               dais = <&rsnd_port0     /* ak4613 */
-                       &rsnd_port1     /* HDMI0  */
+               links = <&rsnd_port0    /* ak4613 */
+                        &rsnd_port1    /* HDMI0  */
                        >;
        };
 
@@ -408,11 +408,8 @@
                        reg = <0>;
                        rsnd_for_ak4613: endpoint {
                                remote-endpoint = <&ak4613_endpoint>;
-
-                               dai-format = "left_j";
-                               bitclock-master = <&rsnd_for_ak4613>;
-                               frame-master = <&rsnd_for_ak4613>;
-
+                               bitclock-master;
+                               frame-master;
                                playback = <&ssi0>, <&src0>, <&dvc0>;
                                capture  = <&ssi1>, <&src1>, <&dvc1>;
                        };
@@ -421,11 +418,8 @@
                        reg = <1>;
                        rsnd_for_hdmi: endpoint {
                                remote-endpoint = <&dw_hdmi0_snd_in>;
-
-                               dai-format = "i2s";
-                               bitclock-master = <&rsnd_for_hdmi>;
-                               frame-master = <&rsnd_for_hdmi>;
-
+                               bitclock-master;
+                               frame-master;
                                playback = <&ssi2>;
                        };
                };