mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 11:23:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Kuninori Morimoto
2024-06-24 00:16:24 +00:00
committed by Geert Uytterhoeven
parent 659c0b4444
commit bd8d7546f9
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/renesas/r8a779g0-white-hawk-ard-audio-da7212.dtso
View File

@@ -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] */

17
arch/arm64/boot/dts/renesas/r8a779g0.dtsi
View File

@@ -1718,18 +1718,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>,
@@ -1739,6 +1727,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";