arm64: dts: renesas: r8a779g0: Tidy up sound DT settings

R-Car V4H (R8A779G0) supports only 1 AUDIO_CLKOUT and 1 SSI,
thus, #clock-cells / #sound-dai-cells are both fixed to zero.
(#sound-dai-cells is needed for Simple-Audio-Card, but not needed for
Audio-Graph-Card).  Fix this up.

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

diff --git a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ard-audio-da7212.dtso b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ard-audio-da7212.dtso
index e6f53377ecd90c6b6e245ddb74b7e1f550e500d9..e6cf304c77ee9225725bebda1203b809c7734050 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ard-audio-da7212.dtso
+++ b/arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ard-audio-da7212.dtso
@@ -155,11 +155,7 @@
        pinctrl-0 = <&sound_clk_pins>, <&sound_pins>;
        pinctrl-names = "default";
 
-       /* Single DAI */
-       #sound-dai-cells = <0>;
-
        /* audio_clkout */
-       #clock-cells = <0>;
        clock-frequency = <5644800>; /* 44.1kHz groups [(C) clock] */
 //     clock-frequency = <6144000>; /* 48  kHz groups [(C) clock] */
 

diff --git a/arch/arm64/boot/dts/renesas/r8a779g0.dtsi b/arch/arm64/boot/dts/renesas/r8a779g0.dtsi
index c33d8c01e3016aac21ecda3cbaa4b955ee401d5d..53d1d4d8197af5dd701ddbb856286f2e3ef19dc5 100644 (file)
--- a/arch/arm64/boot/dts/renesas/r8a779g0.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a779g0.dtsi
@@ -1718,18 +1718,6 @@
                };
 
                rcar_sound: sound@ec5a0000 {
-                       /*
-                        * #sound-dai-cells is required
-                        *
-                        * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>;
-                        * Multi  DAI : #sound-dai-cells = <1>; <&rcar_sound N>;
-                        */
-                       /*
-                        * #clock-cells is required
-                        *
-                        * clkout               : #clock-cells = <0>;   <&rcar_sound>;
-                        * audio_clkout0/1/2/3  : #clock-cells = <1>;   <&rcar_sound N>;
-                        */
                        compatible = "renesas,rcar_sound-r8a779g0", "renesas,rcar_sound-gen4";
                        reg = <0 0xec5a0000 0 0x020>,
                              <0 0xec540000 0 0x1000>,
@@ -1739,6 +1727,11 @@
 
                        clocks = <&cpg CPG_MOD 2926>, <&cpg CPG_MOD 2927>, <&audio_clkin>;
                        clock-names = "ssiu.0", "ssi.0", "clkin";
+                       /* #clock-cells is fixed */
+                       #clock-cells = <0>;
+                       /* #sound-dai-cells is fixed */
+                       #sound-dai-cells = <0>;
+
                        power-domains = <&sysc R8A779G0_PD_ALWAYS_ON>;
                        resets = <&cpg 2926>, <&cpg 2927>;
                        reset-names = "ssiu.0", "ssi.0";