diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2014-12-17 06:11:52 +0000 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-01-13 11:01:54 +0900 |
| commit | ad63241cdc328edbb0f879416ea7707bf0997f08 (patch) | |
| tree | 1b75833e614c57b7b82e24b9dd7e583ec87c669a /arch/arm | |
| parent | f49cd2b3d2caf075d78fa1948fda1d7ed246d1eb (diff) | |
ARM: shmobile: r8a7790: 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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/r8a7790-lager.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7790.dtsi | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index 636d53bb87a2..2bc20e44fff9 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts @@ -579,6 +579,7 @@ pinctrl-0 = <&sound_pins &sound_clk_pins>; pinctrl-names = "default"; + /* Single DAI */ #sound-dai-cells = <0>; status = "okay"; diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index 7cef4d9f0377..1543fa5f21d5 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -1397,7 +1397,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-r8a7790", "renesas,rcar_sound-gen2"; reg = <0 0xec500000 0 0x1000>, /* SCU */ <0 0xec5a0000 0 0x100>, /* ADG */ |