mbox series

[0/3] Add HDMI Audio support

Message ID 20240725084559.13127-1-biju.das.jz@bp.renesas.com
Headers show
Series Add HDMI Audio support | expand

Message

Biju Das July 25, 2024, 8:45 a.m. UTC
This patch series aims to add HDMI audio support for RZ/{G2L,G2LC,V2L}
SMARC EVKs.

Biju Das (3):
  ASoC: dt-bindings: renesas,rz-ssi: Document port property
  arm64: dts: renesas: rzg2l-smarc: Enable HDMI audio
  arm64: dts: renesas: rzg2lc-smarc: Enable HDMI audio

 .../bindings/sound/renesas,rz-ssi.yaml        |  4 ++
 .../boot/dts/renesas/r9a07g044c2-smarc.dts    |  3 ++
 .../dts/renesas/rzg2l-smarc-pinfunction.dtsi  |  7 ++++
 arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi  | 30 +++++++++++++++
 arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 37 +++++++++++++++++++
 5 files changed, 81 insertions(+)

Comments

Mark Brown July 29, 2024, 5:17 p.m. UTC | #1
On Thu, 25 Jul 2024 09:45:53 +0100, Biju Das wrote:
> This patch series aims to add HDMI audio support for RZ/{G2L,G2LC,V2L}
> SMARC EVKs.
> 
> Biju Das (3):
>   ASoC: dt-bindings: renesas,rz-ssi: Document port property
>   arm64: dts: renesas: rzg2l-smarc: Enable HDMI audio
>   arm64: dts: renesas: rzg2lc-smarc: Enable HDMI audio
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/3] ASoC: dt-bindings: renesas,rz-ssi: Document port property
      commit: 2cc719983603f0e9d24da256b58d6abb79e3884a

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
Geert Uytterhoeven Aug. 23, 2024, 9:59 a.m. UTC | #2
Hi Biju,

On Thu, Jul 25, 2024 at 10:46 AM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> Enable HDMI audio on RZ/{G2L,V2L} SMARC EVK.
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>

Thanks for your patch!

> --- a/arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi
> +++ b/arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi
> @@ -143,6 +143,13 @@ ssi0_pins: ssi0 {
>                          <RZG2L_PORT_PINMUX(45, 3, 1)>; /* RXD */
>         };
>
> +       ssi1_pins: ssi1 {
> +               pinmux = <RZG2L_PORT_PINMUX(46, 0, 1)>, /* BCK */
> +                        <RZG2L_PORT_PINMUX(46, 1, 1)>, /* RCK */
> +                        <RZG2L_PORT_PINMUX(46, 2, 1)>, /* TXD */
> +                        <RZG2L_PORT_PINMUX(46, 3, 1)>; /* RXD */

RXD/I2S2_SDIN is not wired on the carrier board.
OK to drop it?

The rest LGTM (but I'm no audio bindings expert).

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 Aug. 23, 2024, 10:02 a.m. UTC | #3
Hi Biju,

On Thu, Jul 25, 2024 at 10:46 AM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> Enable HDMI audio on RZ/G2LC SMARC EVK. Set SW 1.5 to OFF
> position on the SoM module to turn on HDMI audio.
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>

Thanks for your patch!

> --- a/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
> +++ b/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
> @@ -48,10 +58,16 @@ &canfd {
>  };
>  #endif
>
> +#if (!SW_I2S0_I2S1)
>  &cpu_dai {
>         sound-dai = <&ssi0>;
>  };
>
> +&ssi0 {
> +       /delete-node/ port;

Which submode does this delete?
The conditional one below which is only added when SW_I2S0_I2S1==1?

> +};
> +#endif
> +
>  &dsi {
>         status = "okay";
>

> @@ -177,6 +202,18 @@ &ssi0 {
>         pinctrl-names = "default";
>
>         status = "okay";
> +
> +#if (SW_I2S0_I2S1)
> +       i2s2_port: port {
> +               i2s2_cpu_endpoint: endpoint {
> +                       remote-endpoint = <&codec_endpoint>;
> +                       dai-format = "i2s";
> +
> +                       bitclock-master = <&i2s2_cpu_endpoint>;
> +                       frame-master = <&i2s2_cpu_endpoint>;
> +               };
> +       };
> +#endif
>  };
>
>  #if (SW_RSPI_CAN)

The rest LGTM.

Gr{oetje,eeting}s,

                        Geert
Biju Das Aug. 23, 2024, 10:38 a.m. UTC | #4
Hi Geert,

Thanks for the feedback.

> -----Original Message-----
> From: Geert Uytterhoeven <geert@linux-m68k.org>
> Sent: Friday, August 23, 2024 10:59 AM
> Subject: Re: [PATCH 2/3] arm64: dts: renesas: rzg2l-smarc: Enable HDMI audio
> 
> Hi Biju,
> 
> On Thu, Jul 25, 2024 at 10:46 AM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> > Enable HDMI audio on RZ/{G2L,V2L} SMARC EVK.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> 
> Thanks for your patch!
> 
> > --- a/arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi
> > @@ -143,6 +143,13 @@ ssi0_pins: ssi0 {
> >                          <RZG2L_PORT_PINMUX(45, 3, 1)>; /* RXD */
> >         };
> >
> > +       ssi1_pins: ssi1 {
> > +               pinmux = <RZG2L_PORT_PINMUX(46, 0, 1)>, /* BCK */
> > +                        <RZG2L_PORT_PINMUX(46, 1, 1)>, /* RCK */
> > +                        <RZG2L_PORT_PINMUX(46, 2, 1)>, /* TXD */
> > +                        <RZG2L_PORT_PINMUX(46, 3, 1)>; /* RXD */
> 
> RXD/I2S2_SDIN is not wired on the carrier board.
> OK to drop it?

Yes, it can be dropped as it is not wired on the Carrier.
I will send a patch dropping this.

Cheers,
Biju
Biju Das Aug. 23, 2024, 10:42 a.m. UTC | #5
Hi Geert,

Thanks for the feedback.

> -----Original Message-----
> From: Geert Uytterhoeven <geert@linux-m68k.org>
> Sent: Friday, August 23, 2024 11:02 AM
> Subject: Re: [PATCH 3/3] arm64: dts: renesas: rzg2lc-smarc: Enable HDMI audio
> 
> Hi Biju,
> 
> On Thu, Jul 25, 2024 at 10:46 AM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> > Enable HDMI audio on RZ/G2LC SMARC EVK. Set SW 1.5 to OFF position on
> > the SoM module to turn on HDMI audio.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> 
> Thanks for your patch!
> 
> > --- a/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi
> > @@ -48,10 +58,16 @@ &canfd {
> >  };
> >  #endif
> >
> > +#if (!SW_I2S0_I2S1)
> >  &cpu_dai {
> >         sound-dai = <&ssi0>;
> >  };
> >
> > +&ssi0 {
> > +       /delete-node/ port;
> 
> Which submode does this delete?
> The conditional one below which is only added when SW_I2S0_I2S1==1?

It is not needed. SSIx signal is routed either to Codec
Or HDMI audio based on switch position.

I will send a patch fixing this.

Cheers,
Biju

> 
> > +};
> > +#endif
> > +
> >  &dsi {
> >         status = "okay";
> >
> 
> > @@ -177,6 +202,18 @@ &ssi0 {
> >         pinctrl-names = "default";
> >
> >         status = "okay";
> > +
> > +#if (SW_I2S0_I2S1)
> > +       i2s2_port: port {
> > +               i2s2_cpu_endpoint: endpoint {
> > +                       remote-endpoint = <&codec_endpoint>;
> > +                       dai-format = "i2s";
> > +
> > +                       bitclock-master = <&i2s2_cpu_endpoint>;
> > +                       frame-master = <&i2s2_cpu_endpoint>;
> > +               };
> > +       };
> > +#endif
> >  };
> >
> >  #if (SW_RSPI_CAN)
> 
> The rest LGTM.
> 
> 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
Biju Das Aug. 23, 2024, 10:51 a.m. UTC | #6
Hi All,

> -----Original Message-----
> From: Geert Uytterhoeven <geert@linux-m68k.org>
> Sent: Friday, August 23, 2024 10:59 AM
> Subject: Re: [PATCH 2/3] arm64: dts: renesas: rzg2l-smarc: Enable HDMI audio
> 
> Hi Biju,
> 
> On Thu, Jul 25, 2024 at 10:46 AM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> > Enable HDMI audio on RZ/{G2L,V2L} SMARC EVK.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> 
> Thanks for your patch!
> 
> > --- a/arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi
> > @@ -143,6 +143,13 @@ ssi0_pins: ssi0 {
> >                          <RZG2L_PORT_PINMUX(45, 3, 1)>; /* RXD */
> >         };
> >
> > +       ssi1_pins: ssi1 {
> > +               pinmux = <RZG2L_PORT_PINMUX(46, 0, 1)>, /* BCK */
> > +                        <RZG2L_PORT_PINMUX(46, 1, 1)>, /* RCK */
> > +                        <RZG2L_PORT_PINMUX(46, 2, 1)>, /* TXD */
> > +                        <RZG2L_PORT_PINMUX(46, 3, 1)>; /* RXD */
> 
> RXD/I2S2_SDIN is not wired on the carrier board.
> OK to drop it?
> 
> The rest LGTM (but I'm no audio bindings expert).

Is dt binding check allows conditional macros?

Based on switch position audio signal ssi0 is routed to Audio codec
Or ssi1 is routed to HDMI audio port

The former one does not use graph where as latter one uses audio graph
How do I describe this in bindings?

like dts, something like below supported in dt bindings??

#if X
Audio codec
#else
HDMI Audio
#endif

Cheers,
Biju
Biju Das Aug. 23, 2024, 11:04 a.m. UTC | #7
> -----Original Message-----
> From: Biju Das <biju.das.jz@bp.renesas.com>
> Sent: Friday, August 23, 2024 11:51 AM
> To: Geert Uytterhoeven <geert@linux-m68k.org>; Rob Herring <robh@kernel.org>; Krzysztof Kozlowski
> <krzk+dt@kernel.org>; Conor Dooley <conor+dt@kernel.org>
> Cc: Liam Girdwood <lgirdwood@gmail.com>; Mark Brown <broonie@kernel.org>; Magnus Damm
> <magnus.damm@gmail.com>; linux-sound@vger.kernel.org; devicetree@vger.kernel.org; linux-renesas-
> soc@vger.kernel.org; Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>; biju.das.au
> <biju.das.au@gmail.com>
> Subject: RE: [PATCH 2/3] arm64: dts: renesas: rzg2l-smarc: Enable HDMI audio
> 
> Hi All,
> 
> > -----Original Message-----
> > From: Geert Uytterhoeven <geert@linux-m68k.org>
> > Sent: Friday, August 23, 2024 10:59 AM
> > Subject: Re: [PATCH 2/3] arm64: dts: renesas: rzg2l-smarc: Enable HDMI
> > audio
> >
> > Hi Biju,
> >
> > On Thu, Jul 25, 2024 at 10:46 AM Biju Das <biju.das.jz@bp.renesas.com> wrote:
> > > Enable HDMI audio on RZ/{G2L,V2L} SMARC EVK.
> > >
> > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> >
> > Thanks for your patch!
> >
> > > --- a/arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi
> > > +++ b/arch/arm64/boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi
> > > @@ -143,6 +143,13 @@ ssi0_pins: ssi0 {
> > >                          <RZG2L_PORT_PINMUX(45, 3, 1)>; /* RXD */
> > >         };
> > >
> > > +       ssi1_pins: ssi1 {
> > > +               pinmux = <RZG2L_PORT_PINMUX(46, 0, 1)>, /* BCK */
> > > +                        <RZG2L_PORT_PINMUX(46, 1, 1)>, /* RCK */
> > > +                        <RZG2L_PORT_PINMUX(46, 2, 1)>, /* TXD */
> > > +                        <RZG2L_PORT_PINMUX(46, 3, 1)>; /* RXD */
> >
> > RXD/I2S2_SDIN is not wired on the carrier board.
> > OK to drop it?
> >
> > The rest LGTM (but I'm no audio bindings expert).
> 

The below comment is for RZ/G2LC SoC, where switch postion determines whether ssi0 signal is connected to
Audio codec or to the HDMI audio.

> Is dt binding check allows conditional macros?
> 
> Based on switch position audio signal ssi0 is routed to Audio codec Or routed to HDMI audio
> port
> 
> The former one does not use graph where as latter one uses audio graph How do I describe this in
> bindings?
> 
> like dts, something like below supported in dt bindings??
> 
> #if X
> Audio codec
> #else
> HDMI Audio
> #endif
> 
> Cheers,
> Biju