diff mbox series

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

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

Commit Message

Biju Das Oct. 4, 2019, 2:36 p.m. UTC
This patch removes audio port node from SoC device tree and
fixes the below dtb warning

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

Fixes: e77ad88d0c6228af65 ("arm64: dts: renesas: hihope-common: Add HDMI audio support")
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
V1-->V2
 * New patch.

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

Fabrizio Castro Oct. 4, 2019, 2:42 p.m. UTC | #1
Hello Biju,

Thank you for the patch!

> From: Biju Das <biju.das@bp.renesas.com>
> Sent: 04 October 2019 15:37
> To: Rob Herring <robh+dt@kernel.org>; Mark Rutland <mark.rutland@arm.com>
> Cc: Biju Das <biju.das@bp.renesas.com>; Simon Horman <horms@verge.net.au>; Geert Uytterhoeven <geert+renesas@glider.be>;
> Magnus Damm <magnus.damm@gmail.com>; linux-renesas-soc@vger.kernel.org; devicetree@vger.kernel.org; Chris Paterson
> <Chris.Paterson2@renesas.com>; Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> Subject: [PATCH v2 1/2] arm64: dts: renesas: r8a774a1: Remove audio port node
> 
> This patch removes audio port node from SoC device tree and
> fixes the below dtb warning
> 
> Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has
> a unit name, but no reg property

I think you saw this warning midway while working on the patch, I think you can drop this note

> 
> Fixes: e77ad88d0c6228af65 ("arm64: dts: renesas: hihope-common: Add HDMI audio support")

I think you meant e2f04248fcd4 ("arm64: dts: renesas: r8a774a1: Add audio support")

Cheers,
Fab

> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> ---
> V1-->V2
>  * New patch.
> 
> 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(-)
> 
> 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 { };
> --
> 2.7.4
Biju Das Oct. 4, 2019, 2:46 p.m. UTC | #2
Hello Fabrizio,

Thanks for the feedback.

> Subject: RE: [PATCH v2 1/2] arm64: dts: renesas: r8a774a1: Remove audio
> port node
> 
> Hello Biju,
> 
> Thank you for the patch!
> 
> > Subject: [PATCH v2 1/2] arm64: dts: renesas: r8a774a1: Remove audio
> > port node
> >
> > This patch removes audio port node from SoC device tree and fixes the
> > below dtb warning
> >
> > Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0:
> node
> > has a unit name, but no reg property
> 
> I think you saw this warning midway while working on the patch, I think you
> can drop this note

Ok. Will take out this.
> >
> > Fixes: e77ad88d0c6228af65 ("arm64: dts: renesas: hihope-common: Add
> > HDMI audio support")
> 
> I think you meant e2f04248fcd4 ("arm64: dts: renesas: r8a774a1: Add audio
> support")

OK.  Will fix the commit message.

Regards,
Biju

> > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > ---
> > V1-->V2
> >  * New patch.
> >
> > This patch depend upon
> > https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=18
> > 2581
> > ---
> >  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 { };
> > --
> > 2.7.4
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 { };