| Message ID | 87frt3kxew.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 8f3a0069fb2555a60841a15c523aaa110b8e9fb3 |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | arm64: V4M GrayHawk Sound support | expand |
On Mon, Jun 24, 2024 at 2:16 AM Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > R8A779G0 (V4H) supports only 1 AUDIO_CLKOUT and 1 SSI, > thus, #clock-cells / #sound-dai-cells are both fixed 0. > (#sound-dai-cells is needed for Simple-Audio-Card, not needed for > Audio-Graph-Card). This patch fixup it. > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> i.e. will queue in renesas-devel for v6.11. Gr{oetje,eeting}s, Geert
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 e6f53377ecd90..e6cf304c77ee9 100644 --- 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 @@ &rcar_sound { 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 aaeebf736f3f7..6bd5161942aad 100644 --- a/arch/arm64/boot/dts/renesas/r8a779g0.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a779g0.dtsi @@ -1723,18 +1723,6 @@ dmac1: dma-controller@e7351000 { }; 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>, @@ -1744,6 +1732,11 @@ rcar_sound: sound@ec5a0000 { 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";
R8A779G0 (V4H) supports only 1 AUDIO_CLKOUT and 1 SSI, thus, #clock-cells / #sound-dai-cells are both fixed 0. (#sound-dai-cells is needed for Simple-Audio-Card, not needed for Audio-Graph-Card). This patch fixup it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- .../r8a779g0-white-hawk-ard-audio-da7212.dtso | 4 ---- arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 17 +++++------------ 2 files changed, 5 insertions(+), 16 deletions(-)