Re: [PATCH v4 9/9] arm64: dts: renesas: salvator: add a connection from adv748x codec (HDMI input) to the R-Car SoC

[Geert Uytterhoeven]

Hi Alex,

On Thu, Mar 26, 2020 at 11:55 AM Alex Riesen
<alexander.riesen@xxxxxxxxxxx> wrote:
> As all known variants of the Salvator board have the HDMI decoder
> chip (the ADV7482) connected to the SSI4 on R-Car SoC, the ADV7482
> endpoint and the connection definitions are placed in the common board
> file.
>
> For the same reason, the CLK_C clock line and I2C configuration (similar
> to the ak4613, on the same interface) are added into the common file.
>
> Signed-off-by: Alexander Riesen <alexander.riesen@xxxxxxxxxxx>

Thanks for your patch!

> --- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi
> +++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi
> @@ -460,7 +460,7 @@ pca9654: gpio@20 {
>                 #gpio-cells = <2>;
>         };
>
> -       video-receiver@70 {
> +       adv7482_hdmi_in: video-receiver@70 {
>                 compatible = "adi,adv7482";
>                 reg = <0x70 0x71 0x72 0x73 0x74 0x75
>                        0x60 0x61 0x62 0x63 0x64 0x65>;
> @@ -469,6 +469,7 @@ video-receiver@70 {
>
>                 #address-cells = <1>;
>                 #size-cells = <0>;
> +               #clock-cells = <0>; /* the MCLK for I2S output */
>
>                 interrupt-parent = <&gpio6>;
>                 interrupt-names = "intrq1", "intrq2";
> @@ -510,6 +511,15 @@ adv7482_txb: endpoint {
>                                 remote-endpoint = <&csi20_in>;
>                         };
>                 };
> +
> +               port@c {
> +                       reg = <12>;
> +
> +                       adv7482_i2s: endpoint {
> +                               remote-endpoint = <&rsnd_endpoint3>;
> +                               system-clock-direction-out;
> +                       };
> +               };

As the adv748x driver just ignores "invalid" endpoints...

> @@ -733,8 +744,8 @@ &rcar_sound {
>         pinctrl-0 = <&sound_pins &sound_clk_pins>;
>         pinctrl-names = "default";
>
> -       /* Single DAI */
> -       #sound-dai-cells = <0>;
> +       /* multi DAI */
> +       #sound-dai-cells = <1>;
>
>         /* audio_clkout0/1/2/3 */
>         #clock-cells = <1>;
> @@ -758,8 +769,19 @@ &rcar_sound {
>                  <&cpg CPG_MOD 1020>, <&cpg CPG_MOD 1021>,
>                  <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>,
>                  <&audio_clk_a>, <&cs2000>,
> -                <&audio_clk_c>,
> +                <&adv7482_hdmi_in>,
>                  <&cpg CPG_CORE CPG_AUDIO_CLK_I>;

... and the rsnd driver ignores nonexistent-clocks, the DT change has no
hard dependency on the driver change, and won't introduce regressions
when included, right?

> @@ -777,6 +799,21 @@ rsnd_endpoint0: endpoint {
>                                 capture  = <&ssi1 &src1 &dvc1>;
>                         };
>                 };
> +               rsnd_port3: port@3 {
> +                       reg = <3>;
> +                       rsnd_endpoint3: endpoint {
> +                               remote-endpoint = <&adv7482_i2s>;
> +
> +                               dai-tdm-slot-num = <8>;
> +                               dai-tdm-slot-width = <32>;
> +                               dai-format = "left_j";
> +                               mclk-fs = <256>;
> +                               bitclock-master = <&adv7482_i2s>;
> +                               frame-master = <&adv7482_i2s>;
> +
> +                               capture = <&ssi4>;
> +                       };
> +               };
>         };
>  };

However, as salvator-common.dtsi is shared by all Salvator-X(S) variants,
you'll have to add a dummy ssi4 node to r8a77961.dtsi first.

Gr{oetje,eeting}s,

                        Geert


--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

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