[PATCH] [RFC] ARM: shmobile: bockw dts: Override #sound-dai-cells to zero

[PATCH] [RFC] ARM: shmobile: bockw dts: Override #sound-dai-cells to zero

[Geert Uytterhoeven]

The default value of #sound-dai-cells in r8a7778.dtsi is one, while
the /sound/simple-audio-card,cpu device node in r8a7778-bockw.dts uses a
phandle without any extra cells ("<&rcar_sound>"), causing:

    /sound/simple-audio-card,cpu: arguments longer than property
    asoc-simple-card sound: parse error -22
    asoc-simple-card: probe of sound failed with error -22

Override #sound-dai-cells to zero to fix this.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
The rcar_sound node is still disabled. So why is this needed?!?
---
 arch/arm/boot/dts/r8a7778-bockw.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 3c03e6b8261e9348..158ad94fd4d187a7 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -172,6 +172,11 @@
 	};
 };
 
+&rcar_sound {
+	/* Single DAI */
+	#sound-dai-cells = <0>;
+};
+
 &sdhi0 {
 	pinctrl-0 = <&sdhi0_pins>, <&sdhi0_pup_pins>;
 	pinctrl-names = "default";
-- 
1.9.1

[PATCH] [RFC] ARM: shmobile: bockw dts: Override #sound-dai-cells to zero

[Geert Uytterhoeven]

The default value of #sound-dai-cells in r8a7778.dtsi is one, while
the /sound/simple-audio-card,cpu device node in r8a7778-bockw.dts uses a
phandle without any extra cells ("<&rcar_sound>"), causing:

    /sound/simple-audio-card,cpu: arguments longer than property
    asoc-simple-card sound: parse error -22
    asoc-simple-card: probe of sound failed with error -22

Override #sound-dai-cells to zero to fix this.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
The rcar_sound node is still disabled. So why is this needed?!?
---
 arch/arm/boot/dts/r8a7778-bockw.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 3c03e6b8261e9348..158ad94fd4d187a7 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -172,6 +172,11 @@
 	};
 };
 
+&rcar_sound {
+	/* Single DAI */
+	#sound-dai-cells = <0>;
+};
+
 &sdhi0 {
 	pinctrl-0 = <&sdhi0_pins>, <&sdhi0_pup_pins>;
 	pinctrl-names = "default";
-- 
1.9.1

Re: [PATCH] [RFC] ARM: shmobile: bockw dts: Override #sound-dai-cells to zero

[Kuninori Morimoto]

Hi

> The default value of #sound-dai-cells in r8a7778.dtsi is one, while
> the /sound/simple-audio-card,cpu device node in r8a7778-bockw.dts uses a
> phandle without any extra cells ("<&rcar_sound>"), causing:
> 
>     /sound/simple-audio-card,cpu: arguments longer than property
>     asoc-simple-card sound: parse error -22
>     asoc-simple-card: probe of sound failed with error -22
> 
> Override #sound-dai-cells to zero to fix this.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

> The rcar_sound node is still disabled. So why is this needed?!?

This error came from "simple-audio-card", not "rcar_sound" I think.
# sound needs many drivers...

Actually, I don't want to have default #sound-dai-cells in r8a7778.dtsi.
Like below. I will send this patch soon

ad63241cdc328edbb0f879416ea7707bf0997f08
("ARM: shmobile: r8a7790: tidyup #sound-dai-cells settings")

Re: [PATCH] [RFC] ARM: shmobile: bockw dts: Override #sound-dai-cells to zero

[Kuninori Morimoto]

Hi

> The default value of #sound-dai-cells in r8a7778.dtsi is one, while
> the /sound/simple-audio-card,cpu device node in r8a7778-bockw.dts uses a
> phandle without any extra cells ("<&rcar_sound>"), causing:
> 
>     /sound/simple-audio-card,cpu: arguments longer than property
>     asoc-simple-card sound: parse error -22
>     asoc-simple-card: probe of sound failed with error -22
> 
> Override #sound-dai-cells to zero to fix this.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

> The rcar_sound node is still disabled. So why is this needed?!?

This error came from "simple-audio-card", not "rcar_sound" I think.
# sound needs many drivers...

Actually, I don't want to have default #sound-dai-cells in r8a7778.dtsi.
Like below. I will send this patch soon

ad63241cdc328edbb0f879416ea7707bf0997f08
("ARM: shmobile: r8a7790: tidyup #sound-dai-cells settings")

[PATCH] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings

[Kuninori Morimoto]

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>
---
This patch is based on Geert's
ARM: shmobile: bockw dts: Override #sound-dai-cells to zero

 arch/arm/boot/dts/r8a7778.dtsi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 4f8e078..b140627 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -236,7 +236,12 @@
 	};
 
 	rcar_sound: sound@ffd90000 {
-		#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-r8a7778", "renesas,rcar_sound-gen1";
 		reg =	<0xffd90000 0x1000>,	/* SRU */
 			<0xffd91000 0x240>,	/* SSI */
-- 
1.9.1

[PATCH] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings

[Kuninori Morimoto]

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>
---
This patch is based on Geert's
ARM: shmobile: bockw dts: Override #sound-dai-cells to zero

 arch/arm/boot/dts/r8a7778.dtsi | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 4f8e078..b140627 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -236,7 +236,12 @@
 	};
 
 	rcar_sound: sound@ffd90000 {
-		#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-r8a7778", "renesas,rcar_sound-gen1";
 		reg =	<0xffd90000 0x1000>,	/* SRU */
 			<0xffd91000 0x240>,	/* SSI */
-- 
1.9.1

Re: [PATCH] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings

[Simon Horman]

On Tue, Dec 08, 2015 at 12:10:59AM +0000, Kuninori Morimoto wrote:
> 
> 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>
> ---
> This patch is based on Geert's
> ARM: shmobile: bockw dts: Override #sound-dai-cells to zero

Is Geert's patch necessary with this patch?

>  arch/arm/boot/dts/r8a7778.dtsi | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
> index 4f8e078..b140627 100644
> --- a/arch/arm/boot/dts/r8a7778.dtsi
> +++ b/arch/arm/boot/dts/r8a7778.dtsi
> @@ -236,7 +236,12 @@
>  	};
>  
>  	rcar_sound: sound@ffd90000 {
> -		#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-r8a7778", "renesas,rcar_sound-gen1";
>  		reg =	<0xffd90000 0x1000>,	/* SRU */
>  			<0xffd91000 0x240>,	/* SSI */
> -- 
> 1.9.1
> 

Re: [PATCH] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings

[Simon Horman]

On Tue, Dec 08, 2015 at 12:10:59AM +0000, Kuninori Morimoto wrote:
> 
> 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>
> ---
> This patch is based on Geert's
> ARM: shmobile: bockw dts: Override #sound-dai-cells to zero

Is Geert's patch necessary with this patch?

>  arch/arm/boot/dts/r8a7778.dtsi | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
> index 4f8e078..b140627 100644
> --- a/arch/arm/boot/dts/r8a7778.dtsi
> +++ b/arch/arm/boot/dts/r8a7778.dtsi
> @@ -236,7 +236,12 @@
>  	};
>  
>  	rcar_sound: sound@ffd90000 {
> -		#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-r8a7778", "renesas,rcar_sound-gen1";
>  		reg =	<0xffd90000 0x1000>,	/* SRU */
>  			<0xffd91000 0x240>,	/* SSI */
> -- 
> 1.9.1
> 

Re: [PATCH] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings

[Kuninori Morimoto]

Hi Simon

> > 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>
> > ---
> > This patch is based on Geert's
> > ARM: shmobile: bockw dts: Override #sound-dai-cells to zero
> 
> Is Geert's patch necessary with this patch?

I think best order (for git bisect) is

	1. Geert's patch
	2. My patch

Re: [PATCH] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings

[Kuninori Morimoto]

Hi Simon

> > 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>
> > ---
> > This patch is based on Geert's
> > ARM: shmobile: bockw dts: Override #sound-dai-cells to zero
> 
> Is Geert's patch necessary with this patch?

I think best order (for git bisect) is

	1. Geert's patch
	2. My patch

Re: [PATCH] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings

[Simon Horman]

On Tue, Dec 08, 2015 at 01:30:12AM +0000, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > > 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>
> > > ---
> > > This patch is based on Geert's
> > > ARM: shmobile: bockw dts: Override #sound-dai-cells to zero
> > 
> > Is Geert's patch necessary with this patch?
> 
> I think best order (for git bisect) is
> 
> 	1. Geert's patch
> 	2. My patch

Thanks, I will make it so.

Re: [PATCH] ARM: shmobile: r8a7778: tidyup #sound-dai-cells settings

[Simon Horman]

On Tue, Dec 08, 2015 at 01:30:12AM +0000, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > > 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>
> > > ---
> > > This patch is based on Geert's
> > > ARM: shmobile: bockw dts: Override #sound-dai-cells to zero
> > 
> > Is Geert's patch necessary with this patch?
> 
> I think best order (for git bisect) is
> 
> 	1. Geert's patch
> 	2. My patch

Thanks, I will make it so.