Commit d2b541c9 authored Dec 17, 2014 by Kuninori Morimoto Committed by Simon Horman Jan 13, 2015

ARM: shmobile: r8a7791: tidyup #sound-dai-cells settings



Renesas sound driver needs #sound-dai-cells settings, but, this usage
is a little bit confusable. It came from ALSA SoC historical reasons.
The sound DAI naming method is different between Single/Multi DAI in
the ALSA framework, and it is used for sound card matching.
And this #sound-dai-cells has relationship to it.
Current SoC dtsi has #sound-dai-cells = <1> as default settings
(= it is assuming that board/platform has multi DAI), and
board/platform side needs to overwrite it if board/platform was single
DAI. This style is more confusable for users.
This patch removes SoC side default settings, and force to set it by
board/platform side.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

parent ad63241c

arch/arm/boot/dts/r8a7791-koelsch.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -582,6 +582,7 @@
		pinctrl-0 = <&sound_pins &sound_clk_pins>;
		pinctrl-names = "default";

		/* Single DAI */
		#sound-dai-cells = <0>;

		status = "okay";

arch/arm/boot/dts/r8a7791.dtsi

+6 −1

Original line number	Diff line number	Diff line
		@@ -1381,7 +1381,12 @@
		};

		rcar_sound: rcar_sound@ec500000 {
		#sound-dai-cells = <1>;
		/*
		* #sound-dai-cells is required
		*
		* Single DAI : #sound-dai-cells = <0>; <&rcar_sound>;
		* Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>;
		*/
		compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2";
		reg = <0 0xec500000 0 0x1000>, /* SCU */
		<0 0xec5a0000 0 0x100>, /* ADG */