Commit bd8d7546 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Geert Uytterhoeven
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/87frt3kxew.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent 659c0b44

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

+0 −4
Original line number Diff line number Diff line
@@ -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] */

arch/arm64/boot/dts/renesas/r8a779g0.dtsi

+5 −12
Original line number Diff line number Diff line
@@ -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";