diff mbox series

[v2,10/10] arm64: dts: renesas: r8a77961-salvator-xs: add HDMI Sound support

Message ID 87a6y1rtun.wl-kuninori.morimoto.gx@renesas.com (mailing list archive)
State New, archived
Headers show
Series arm64: renesas: enable HDMI Display/Sound on R-Car M3-W+ Salvator-XS | expand

Commit Message

Kuninori Morimoto Sept. 8, 2020, 12:35 a.m. UTC
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

This patch enables HDMI Sound on R-Car M3-W+ Salvator-XS board.

This reverts commit b997613fad58a03588f0f64a3d86db6c5bd76dd2.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 .../boot/dts/renesas/r8a77961-salvator-xs.dts | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

Comments

Laurent Pinchart Sept. 8, 2020, 6:06 a.m. UTC | #1
Hi Morimoto-san,

Thank you for the patch.

On Tue, Sep 08, 2020 at 09:35:25AM +0900, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> This patch enables HDMI Sound on R-Car M3-W+ Salvator-XS board.
> 
> This reverts commit b997613fad58a03588f0f64a3d86db6c5bd76dd2.

Which tree can this commit be found in ?

> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>  .../boot/dts/renesas/r8a77961-salvator-xs.dts | 29 +++++++++++++++++++
>  1 file changed, 29 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts
> index ca21a702db54..1e7603365106 100644
> --- a/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts
> +++ b/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts
> @@ -51,9 +51,38 @@ rcar_dw_hdmi0_out: endpoint {
>  				remote-endpoint = <&hdmi0_con>;
>  			};
>  		};
> +		port@2 {
> +			reg = <2>;
> +			dw_hdmi0_snd_in: endpoint {
> +				remote-endpoint = <&rsnd_endpoint1>;
> +			};
> +		};
>  	};
>  };
>  
>  &hdmi0_con {
>  	remote-endpoint = <&rcar_dw_hdmi0_out>;
>  };
> +
> +&rcar_sound {
> +	ports {
> +		/* rsnd_port0 is on salvator-common */
> +		rsnd_port1: port@1 {
> +			reg = <1>;
> +			rsnd_endpoint1: endpoint {
> +				remote-endpoint = <&dw_hdmi0_snd_in>;
> +
> +				dai-format = "i2s";
> +				bitclock-master = <&rsnd_endpoint1>;
> +				frame-master = <&rsnd_endpoint1>;
> +
> +				playback = <&ssi2>;
> +			};
> +		};
> +	};
> +};
> +
> +&sound_card {
> +	dais = <&rsnd_port0	/* ak4613 */
> +		&rsnd_port1>;	/* HDMI0  */
> +};
Kuninori Morimoto Sept. 8, 2020, 6:33 a.m. UTC | #2
Hi Laurent

Thank you for your review

> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > 
> > This patch enables HDMI Sound on R-Car M3-W+ Salvator-XS board.
> > 
> > This reverts commit b997613fad58a03588f0f64a3d86db6c5bd76dd2.
> 
> Which tree can this commit be found in ?

Grr, I forgot to remove it from git-log.
will fix in v3

Thank you for your help !!

Best regards
---
Kuninori Morimoto
Laurent Pinchart Sept. 8, 2020, 6:37 a.m. UTC | #3
Hi Morimoto-san,

On Tue, Sep 08, 2020 at 03:33:29PM +0900, Kuninori Morimoto wrote:
> 
> Hi Laurent
> 
> Thank you for your review
> 
> > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > 
> > > This patch enables HDMI Sound on R-Car M3-W+ Salvator-XS board.
> > > 
> > > This reverts commit b997613fad58a03588f0f64a3d86db6c5bd76dd2.
> > 
> > Which tree can this commit be found in ?
> 
> Grr, I forgot to remove it from git-log.
> will fix in v3

No worries :-)

I've applied patch 01 to 04 to my tree and plan to send a pull request
later today. Could you just let me know if you're fine with the small
modification to the commit message proposed in 04/10 ?
Kuninori Morimoto Sept. 8, 2020, 6:43 a.m. UTC | #4
Hi Laurent

> > > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > > 
> > > > This patch enables HDMI Sound on R-Car M3-W+ Salvator-XS board.
> > > > 
> > > > This reverts commit b997613fad58a03588f0f64a3d86db6c5bd76dd2.
> > > 
> > > Which tree can this commit be found in ?
> > 
> > Grr, I forgot to remove it from git-log.
> > will fix in v3
> 
> No worries :-)
> 
> I've applied patch 01 to 04 to my tree and plan to send a pull request
> later today. Could you just let me know if you're fine with the small
> modification to the commit message proposed in 04/10 ?

Yes, no objection about it.
Thank you for your help !!

Best regards
---
Kuninori Morimoto
Geert Uytterhoeven Sept. 11, 2020, 7:54 a.m. UTC | #5
On Tue, Sep 8, 2020 at 8:37 AM Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Tue, Sep 08, 2020 at 03:33:29PM +0900, Kuninori Morimoto wrote:
> > > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > >
> > > > This patch enables HDMI Sound on R-Car M3-W+ Salvator-XS board.
> > > >
> > > > This reverts commit b997613fad58a03588f0f64a3d86db6c5bd76dd2.
> > >
> > > Which tree can this commit be found in ?
> >
> > Grr, I forgot to remove it from git-log.
> > will fix in v3
>
> No worries :-)
>
> I've applied patch 01 to 04 to my tree and plan to send a pull request
> later today. Could you just let me know if you're fine with the small
> modification to the commit message proposed in 04/10 ?

And I'm queueing patches 6-10 in renesas-devel for v5.10, with the "revert"
line removed.  For patch 6, I took v1, as it matches what we did for M3-W.

Gr{oetje,eeting}s,

                        Geert
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts
index ca21a702db54..1e7603365106 100644
--- a/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77961-salvator-xs.dts
@@ -51,9 +51,38 @@  rcar_dw_hdmi0_out: endpoint {
 				remote-endpoint = <&hdmi0_con>;
 			};
 		};
+		port@2 {
+			reg = <2>;
+			dw_hdmi0_snd_in: endpoint {
+				remote-endpoint = <&rsnd_endpoint1>;
+			};
+		};
 	};
 };
 
 &hdmi0_con {
 	remote-endpoint = <&rcar_dw_hdmi0_out>;
 };
+
+&rcar_sound {
+	ports {
+		/* rsnd_port0 is on salvator-common */
+		rsnd_port1: port@1 {
+			reg = <1>;
+			rsnd_endpoint1: endpoint {
+				remote-endpoint = <&dw_hdmi0_snd_in>;
+
+				dai-format = "i2s";
+				bitclock-master = <&rsnd_endpoint1>;
+				frame-master = <&rsnd_endpoint1>;
+
+				playback = <&ssi2>;
+			};
+		};
+	};
+};
+
+&sound_card {
+	dais = <&rsnd_port0	/* ak4613 */
+		&rsnd_port1>;	/* HDMI0  */
+};