* [PATCH 1/4] ARM: shmobile: r8a7790 dtsi: Drop "renesas, rcar_sound" compatible value
2015-01-16 2:34 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.20 Simon Horman
@ 2015-01-16 2:34 ` Simon Horman
2015-01-16 2:34 ` [PATCH 2/4] ARM: shmobile: r8a7791 " Simon Horman
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-01-16 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
The "renesas,rcar_sound" compatible property value was never processed
nor documented.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index af7e255..7cef4d9 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1398,7 +1398,7 @@
rcar_sound: rcar_sound at ec500000 {
#sound-dai-cells = <1>;
- compatible = "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
+ compatible = "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2";
reg = <0 0xec500000 0 0x1000>, /* SCU */
<0 0xec5a0000 0 0x100>, /* ADG */
<0 0xec540000 0 0x1000>, /* SSIU */
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] ARM: shmobile: r8a7791 dtsi: Drop "renesas, rcar_sound" compatible value
2015-01-16 2:34 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.20 Simon Horman
2015-01-16 2:34 ` [PATCH 1/4] ARM: shmobile: r8a7790 dtsi: Drop "renesas, rcar_sound" compatible value Simon Horman
@ 2015-01-16 2:34 ` Simon Horman
2015-01-16 2:34 ` [PATCH 3/4] ARM: shmobile: r8a7790: tidyup #sound-dai-cells settings Simon Horman
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-01-16 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
The "renesas,rcar_sound" compatible property value was never processed
nor documented.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 77c0bee..7fdd1a6 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1382,7 +1382,7 @@
rcar_sound: rcar_sound at ec500000 {
#sound-dai-cells = <1>;
- compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
+ compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2";
reg = <0 0xec500000 0 0x1000>, /* SCU */
<0 0xec5a0000 0 0x100>, /* ADG */
<0 0xec540000 0 0x1000>, /* SSIU */
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] ARM: shmobile: r8a7790: tidyup #sound-dai-cells settings
2015-01-16 2:34 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.20 Simon Horman
2015-01-16 2:34 ` [PATCH 1/4] ARM: shmobile: r8a7790 dtsi: Drop "renesas, rcar_sound" compatible value Simon Horman
2015-01-16 2:34 ` [PATCH 2/4] ARM: shmobile: r8a7791 " Simon Horman
@ 2015-01-16 2:34 ` Simon Horman
2015-01-16 2:34 ` [PATCH 4/4] ARM: shmobile: r8a7791: " Simon Horman
2015-01-20 0:34 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.20 Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-01-16 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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>
---
arch/arm/boot/dts/r8a7790-lager.dts | 1 +
arch/arm/boot/dts/r8a7790.dtsi | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 636d53b..2bc20e4 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 7cef4d9..1543fa5 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1397,7 +1397,12 @@
};
rcar_sound: rcar_sound at 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 */
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] ARM: shmobile: r8a7791: tidyup #sound-dai-cells settings
2015-01-16 2:34 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.20 Simon Horman
` (2 preceding siblings ...)
2015-01-16 2:34 ` [PATCH 3/4] ARM: shmobile: r8a7790: tidyup #sound-dai-cells settings Simon Horman
@ 2015-01-16 2:34 ` Simon Horman
2015-01-20 0:34 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.20 Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2015-01-16 2:34 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 1 +
arch/arm/boot/dts/r8a7791.dtsi | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 990af16..9c651c0 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -582,6 +582,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/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 7fdd1a6..002dbc5 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1381,7 +1381,12 @@
};
rcar_sound: rcar_sound at 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 */
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.20
2015-01-16 2:34 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.20 Simon Horman
` (3 preceding siblings ...)
2015-01-16 2:34 ` [PATCH 4/4] ARM: shmobile: r8a7791: " Simon Horman
@ 2015-01-20 0:34 ` Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2015-01-20 0:34 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jan 16, 2015 at 11:34:44AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider this second round of Renesas ARM based SoC DT cleanups for
> v3.20.
>
>
> The following changes since commit 97bf6af1f928216fd6c5a66e8a57bfa95a659672:
>
> Linux 3.19-rc1 (2014-12-20 17:08:50 -0800)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-cleanups2-for-v3.20
>
> for you to fetch changes up to d2b541c98f5402ebb49ee1c636ef5bc31462b4ca:
>
> ARM: shmobile: r8a7791: tidyup #sound-dai-cells settings (2015-01-13 11:01:55 +0900)
Merged, thanks.
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread