diff mbox series

[v3,1/2] arm64: dts: renesas: r8a774a1: Remove audio port node

Message ID 1570200761-884-1-git-send-email-biju.das@bp.renesas.com (mailing list archive)
State Mainlined
Commit a381325812691f57aece60aaee76938ac8fc6619
Delegated to: Geert Uytterhoeven
Headers show
Series [v3,1/2] arm64: dts: renesas: r8a774a1: Remove audio port node | expand

Commit Message

Biju Das Oct. 4, 2019, 2:52 p.m. UTC
This patch removes audio port node from SoC device tree.

Fixes: e2f04248fcd4 ("arm64: dts: renesas: r8a774a1: Add audio support")
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
V1-->V2
 * New patch.
V2-->V3
 * Fixed the commit message. Thanks to Fabrizio.

This patch depend upon
https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=182581
---
 arch/arm64/boot/dts/renesas/hihope-common.dtsi | 20 +++++++++-----------
 arch/arm64/boot/dts/renesas/r8a774a1.dtsi      | 11 -----------
 2 files changed, 9 insertions(+), 22 deletions(-)

Comments

Geert Uytterhoeven Oct. 8, 2019, 1:21 p.m. UTC | #1
Hi Biju,

Thanks for your patch!

On Fri, Oct 4, 2019 at 4:53 PM Biju Das <biju.das@bp.renesas.com> wrote:
> This patch removes audio port node from SoC device tree.

Standard review comment: "Why?"

> Fixes: e2f04248fcd4 ("arm64: dts: renesas: r8a774a1: Add audio support")
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> ---
> V1-->V2
>  * New patch.
> V2-->V3
>  * Fixed the commit message. Thanks to Fabrizio.
>
> This patch depend upon
> https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=182581

Why the dependency?
This looks like a fix for r8a774a1, too?

> ---
>  arch/arm64/boot/dts/renesas/hihope-common.dtsi | 20 +++++++++-----------
>  arch/arm64/boot/dts/renesas/r8a774a1.dtsi      | 11 -----------
>  2 files changed, 9 insertions(+), 22 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/renesas/hihope-common.dtsi b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
> index 355d0a2..2c942a7 100644
> --- a/arch/arm64/boot/dts/renesas/hihope-common.dtsi
> +++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
> @@ -86,7 +86,7 @@
>
>                 label = "rcar-sound";
>
> -               dais = <&rsnd_port0>;
> +               dais = <&rsnd_port>;
>         };
>
>         vbus0_usb2: regulator-vbus0-usb2 {
> @@ -183,7 +183,7 @@
>                 port@2 {
>                         reg = <2>;
>                         dw_hdmi0_snd_in: endpoint {
> -                               remote-endpoint = <&rsnd_endpoint0>;
> +                               remote-endpoint = <&rsnd_endpoint>;
>                         };
>                 };
>         };
> @@ -319,17 +319,15 @@
>         /* Single DAI */
>         #sound-dai-cells = <0>;
>
> -       ports {
> -               rsnd_port0: port@0 {
> -                       rsnd_endpoint0: endpoint {
> -                               remote-endpoint = <&dw_hdmi0_snd_in>;
> +       rsnd_port: port {
> +               rsnd_endpoint: endpoint {
> +                       remote-endpoint = <&dw_hdmi0_snd_in>;
>
> -                               dai-format = "i2s";
> -                               bitclock-master = <&rsnd_endpoint0>;
> -                               frame-master = <&rsnd_endpoint0>;
> +                       dai-format = "i2s";
> +                       bitclock-master = <&rsnd_endpoint>;
> +                       frame-master = <&rsnd_endpoint>;
>
> -                               playback = <&ssi2>;
> -                       };
> +                       playback = <&ssi2>;
>                 };
>         };
>  };
> diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
> index d179ee3..34a9f47 100644
> --- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
> @@ -1726,17 +1726,6 @@
>                                       "ssi.1", "ssi.0";
>                         status = "disabled";
>
> -                       ports {
> -                               #address-cells = <1>;
> -                               #size-cells = <0>;
> -                               port@0 {
> -                                       reg = <0>;
> -                               };
> -                               port@1 {
> -                                       reg = <1>;
> -                               };
> -                       };
> -
>                         rcar_sound,ctu {
>                                 ctu00: ctu-0 { };
>                                 ctu01: ctu-1 { };

Gr{oetje,eeting}s,

                        Geert
Biju Das Oct. 8, 2019, 1:43 p.m. UTC | #2
Hi Geert,

Thanks for the feedback.

> Subject: Re: [PATCH v3 1/2] arm64: dts: renesas: r8a774a1: Remove audio
> port node
> 
> Hi Biju,
> 
> Thanks for your patch!
> 
> On Fri, Oct 4, 2019 at 4:53 PM Biju Das <biju.das@bp.renesas.com> wrote:
> > This patch removes audio port node from SoC device tree.
> 
> Standard review comment: "Why?"
> 
> > Fixes: e2f04248fcd4 ("arm64: dts: renesas: r8a774a1: Add audio
> > support")
> > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > ---
> > V1-->V2
> >  * New patch.
> > V2-->V3
> >  * Fixed the commit message. Thanks to Fabrizio.
> >
> > This patch depend upon
> > https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=18
> > 2581
> 
> Why the dependency?
> This looks like a fix for r8a774a1, too?

Sorry, the above dependency is for the second patch. 
"[v3,2/2] arm64: dts: renesas: r8a774b1: Add Sound and Audio DMAC device nodes"

Regards,
Biju
> > ---
> >  arch/arm64/boot/dts/renesas/hihope-common.dtsi | 20 +++++++++-------
> ----
> >  arch/arm64/boot/dts/renesas/r8a774a1.dtsi      | 11 -----------
> >  2 files changed, 9 insertions(+), 22 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/renesas/hihope-common.dtsi
> > b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
> > index 355d0a2..2c942a7 100644
> > --- a/arch/arm64/boot/dts/renesas/hihope-common.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
> > @@ -86,7 +86,7 @@
> >
> >                 label = "rcar-sound";
> >
> > -               dais = <&rsnd_port0>;
> > +               dais = <&rsnd_port>;
> >         };
> >
> >         vbus0_usb2: regulator-vbus0-usb2 { @@ -183,7 +183,7 @@
> >                 port@2 {
> >                         reg = <2>;
> >                         dw_hdmi0_snd_in: endpoint {
> > -                               remote-endpoint = <&rsnd_endpoint0>;
> > +                               remote-endpoint = <&rsnd_endpoint>;
> >                         };
> >                 };
> >         };
> > @@ -319,17 +319,15 @@
> >         /* Single DAI */
> >         #sound-dai-cells = <0>;
> >
> > -       ports {
> > -               rsnd_port0: port@0 {
> > -                       rsnd_endpoint0: endpoint {
> > -                               remote-endpoint = <&dw_hdmi0_snd_in>;
> > +       rsnd_port: port {
> > +               rsnd_endpoint: endpoint {
> > +                       remote-endpoint = <&dw_hdmi0_snd_in>;
> >
> > -                               dai-format = "i2s";
> > -                               bitclock-master = <&rsnd_endpoint0>;
> > -                               frame-master = <&rsnd_endpoint0>;
> > +                       dai-format = "i2s";
> > +                       bitclock-master = <&rsnd_endpoint>;
> > +                       frame-master = <&rsnd_endpoint>;
> >
> > -                               playback = <&ssi2>;
> > -                       };
> > +                       playback = <&ssi2>;
> >                 };
> >         };
> >  };
> > diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
> > b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
> > index d179ee3..34a9f47 100644
> > --- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
> > @@ -1726,17 +1726,6 @@
> >                                       "ssi.1", "ssi.0";
> >                         status = "disabled";
> >
> > -                       ports {
> > -                               #address-cells = <1>;
> > -                               #size-cells = <0>;
> > -                               port@0 {
> > -                                       reg = <0>;
> > -                               };
> > -                               port@1 {
> > -                                       reg = <1>;
> > -                               };
> > -                       };
> > -
> >                         rcar_sound,ctu {
> >                                 ctu00: ctu-0 { };
> >                                 ctu01: ctu-1 { };
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-
> m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds
Geert Uytterhoeven Oct. 10, 2019, 12:56 p.m. UTC | #3
Hi Biju,

On Tue, Oct 8, 2019 at 3:43 PM Biju Das <biju.das@bp.renesas.com> wrote:
> > Subject: Re: [PATCH v3 1/2] arm64: dts: renesas: r8a774a1: Remove audio
> > port node
> > On Fri, Oct 4, 2019 at 4:53 PM Biju Das <biju.das@bp.renesas.com> wrote:
> > > This patch removes audio port node from SoC device tree.
> >
> > Standard review comment: "Why?"

Bcause it fixes a dtb warning?

   Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has
   a unit name, but no reg property

> >
> > > Fixes: e2f04248fcd4 ("arm64: dts: renesas: r8a774a1: Add audio
> > > support")
> > > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > > ---
> > > V1-->V2
> > >  * New patch.
> > > V2-->V3
> > >  * Fixed the commit message. Thanks to Fabrizio.
> > >
> > > This patch depend upon
> > > https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=18
> > > 2581
> >
> > Why the dependency?
> > This looks like a fix for r8a774a1, too?
>
> Sorry, the above dependency is for the second patch.
> "[v3,2/2] arm64: dts: renesas: r8a774b1: Add Sound and Audio DMAC device nodes"

OK.

Gr{oetje,eeting}s,

                        Geert
Biju Das Oct. 10, 2019, 1:04 p.m. UTC | #4
Hi Geert,

Thanks for the feedback.

> Subject: Re: [PATCH v3 1/2] arm64: dts: renesas: r8a774a1: Remove audio
> port node
> 
> Hi Biju,
> 
> On Tue, Oct 8, 2019 at 3:43 PM Biju Das <biju.das@bp.renesas.com> wrote:
> > > Subject: Re: [PATCH v3 1/2] arm64: dts: renesas: r8a774a1: Remove
> > > audio port node On Fri, Oct 4, 2019 at 4:53 PM Biju Das
> > > <biju.das@bp.renesas.com> wrote:
> > > > This patch removes audio port node from SoC device tree.
> > >
> > > Standard review comment: "Why?"
> 
> Bcause it fixes a dtb warning?
> 
>    Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0:
> node has
>    a unit name, but no reg property

I also noticed this warning.

We will get this warning, if we  apply the patch  "[v3,2/2] arm64: dts: renesas: r8a774b1: Add Sound and Audio DMAC
 device nodes" first and then this one.

If it is other way around, then there won't be any warning. That is the reason I didn't mention it in the commit message.

Regards,
Biju

> > >
> > > > Fixes: e2f04248fcd4 ("arm64: dts: renesas: r8a774a1: Add audio
> > > > support")
> > > > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > > > ---
> > > > V1-->V2
> > > >  * New patch.
> > > > V2-->V3
> > > >  * Fixed the commit message. Thanks to Fabrizio.
> > > >
> > > > This patch depend upon
> > > > https://patchwork.kernel.org/project/linux-renesas-soc/list/?serie
> > > > s=18
> > > > 2581
> > >
> > > Why the dependency?
> > > This looks like a fix for r8a774a1, too?
> >
> > Sorry, the above dependency is for the second patch.
> > "[v3,2/2] arm64: dts: renesas: r8a774b1: Add Sound and Audio DMAC
> device nodes"
> 
> OK.
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-
> m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds
Geert Uytterhoeven Oct. 10, 2019, 1:19 p.m. UTC | #5
Hi Biju,

On Thu, Oct 10, 2019 at 3:04 PM Biju Das <biju.das@bp.renesas.com> wrote:
> > Subject: Re: [PATCH v3 1/2] arm64: dts: renesas: r8a774a1: Remove audio
> > port node

> > On Tue, Oct 8, 2019 at 3:43 PM Biju Das <biju.das@bp.renesas.com> wrote:
> > > > Subject: Re: [PATCH v3 1/2] arm64: dts: renesas: r8a774a1: Remove
> > > > audio port node On Fri, Oct 4, 2019 at 4:53 PM Biju Das
> > > > <biju.das@bp.renesas.com> wrote:
> > > > > This patch removes audio port node from SoC device tree.
> > > >
> > > > Standard review comment: "Why?"
> >
> > Bcause it fixes a dtb warning?
> >
> >    Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0:
> > node has
> >    a unit name, but no reg property
>
> I also noticed this warning.
>
> We will get this warning, if we  apply the patch  "[v3,2/2] arm64: dts: renesas: r8a774b1: Add Sound and Audio DMAC
>  device nodes" first and then this one.
>
> If it is other way around, then there won't be any warning. That is the reason I didn't mention it in the commit message.

I even see the warning with current renesas-devel ("make dtbs W=1"),
which does not have "[v3,2/2] arm64: dts: renesas: r8a774b1: Add Sound
and Audio DMAC device nodes" yet.

So I'll apply this patch with the warning message in the commit log, unless
I'm missing something?

Gr{oetje,eeting}s,

                        Geert
Biju Das Oct. 10, 2019, 2:01 p.m. UTC | #6
Hi Geert,

Thanks for the feedback.

> Subject: Re: [PATCH v3 1/2] arm64: dts: renesas: r8a774a1: Remove audio
> port node
> 
> Hi Biju,
> 
> On Thu, Oct 10, 2019 at 3:04 PM Biju Das <biju.das@bp.renesas.com> wrote:
> > > Subject: Re: [PATCH v3 1/2] arm64: dts: renesas: r8a774a1: Remove
> > > audio port node
> 
> > > On Tue, Oct 8, 2019 at 3:43 PM Biju Das <biju.das@bp.renesas.com>
> wrote:
> > > > > Subject: Re: [PATCH v3 1/2] arm64: dts: renesas: r8a774a1:
> > > > > Remove audio port node On Fri, Oct 4, 2019 at 4:53 PM Biju Das
> > > > > <biju.das@bp.renesas.com> wrote:
> > > > > > This patch removes audio port node from SoC device tree.
> > > > >
> > > > > Standard review comment: "Why?"
> > >
> > > Bcause it fixes a dtb warning?
> > >
> > >    Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0:
> > > node has
> > >    a unit name, but no reg property
> >
> > I also noticed this warning.
> >
> > We will get this warning, if we  apply the patch  "[v3,2/2] arm64:
> > dts: renesas: r8a774b1: Add Sound and Audio DMAC  device nodes" first
> and then this one.
> >
> > If it is other way around, then there won't be any warning. That is the
> reason I didn't mention it in the commit message.
> 
> I even see the warning with current renesas-devel ("make dtbs W=1"), which
> does not have "[v3,2/2] arm64: dts: renesas: r8a774b1: Add Sound and Audio
> DMAC device nodes" yet.
> 
> So I'll apply this patch with the warning message in the commit log, unless I'm
> missing something?

Thanks Geert.  Sorry for the confusion, I see the warning with current renesas-devel  branch for r8a774b1 SoC.

Regards,
Biju
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/renesas/hihope-common.dtsi b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
index 355d0a2..2c942a7 100644
--- a/arch/arm64/boot/dts/renesas/hihope-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
@@ -86,7 +86,7 @@ 
 
 		label = "rcar-sound";
 
-		dais = <&rsnd_port0>;
+		dais = <&rsnd_port>;
 	};
 
 	vbus0_usb2: regulator-vbus0-usb2 {
@@ -183,7 +183,7 @@ 
 		port@2 {
 			reg = <2>;
 			dw_hdmi0_snd_in: endpoint {
-				remote-endpoint = <&rsnd_endpoint0>;
+				remote-endpoint = <&rsnd_endpoint>;
 			};
 		};
 	};
@@ -319,17 +319,15 @@ 
 	/* Single DAI */
 	#sound-dai-cells = <0>;
 
-	ports {
-		rsnd_port0: port@0 {
-			rsnd_endpoint0: endpoint {
-				remote-endpoint = <&dw_hdmi0_snd_in>;
+	rsnd_port: port {
+		rsnd_endpoint: endpoint {
+			remote-endpoint = <&dw_hdmi0_snd_in>;
 
-				dai-format = "i2s";
-				bitclock-master = <&rsnd_endpoint0>;
-				frame-master = <&rsnd_endpoint0>;
+			dai-format = "i2s";
+			bitclock-master = <&rsnd_endpoint>;
+			frame-master = <&rsnd_endpoint>;
 
-				playback = <&ssi2>;
-			};
+			playback = <&ssi2>;
 		};
 	};
 };
diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
index d179ee3..34a9f47 100644
--- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
@@ -1726,17 +1726,6 @@ 
 				      "ssi.1", "ssi.0";
 			status = "disabled";
 
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				port@0 {
-					reg = <0>;
-				};
-				port@1 {
-					reg = <1>;
-				};
-			};
-
 			rcar_sound,ctu {
 				ctu00: ctu-0 { };
 				ctu01: ctu-1 { };