Message ID | 1494850964-7246-3-git-send-email-geert+renesas@glider.be (mailing list archive) |
---|---|
State | Rejected |
Delegated to: | Simon Horman |
Headers | show |
Hi Geert, Thank you for the patch. On Monday 15 May 2017 14:22:44 Geert Uytterhoeven wrote: > The extensions to the first HDMI device and connector nodes apply to > Salvator-X boards equipped with either an R-Car H3 or M3-W SoC. > Hence move them from the R-Car H3 specific board file to the common > Salvator-X board file. > > The second HDMI device and connector nodes are left as-is, as R-Car M3-W > has only one HDMI output. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> I wonder whether this is really worth it, given that the number of HDMI ports is different between the two boards. I actually had similar patches in my tree and then decided to drop them, as I found that splitting the H3 Salvator-X HDMI ports salvator-x.dtsi and r8a7795-salvator-x.dts was getting pretty confusing. > --- > arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 17 ----------------- > arch/arm64/boot/dts/renesas/salvator-x.dtsi | 17 +++++++++++++++++ > 2 files changed, 17 insertions(+), 17 deletions(-) > > diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts > b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts index > fcd9ca73f2c76768..22e5324e7ada0eea 100644 > --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts > +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts > @@ -58,23 +58,6 @@ > status = "okay"; > }; > > -&hdmi0 { > - status = "okay"; > - > - ports { > - port@1 { > - reg = <1>; > - rcar_dw_hdmi0_out: endpoint { > - remote-endpoint = <&hdmi0_con>; > - }; > - }; > - }; > -}; > - > -&hdmi0_con { > - remote-endpoint = <&rcar_dw_hdmi0_out>; > -}; > - > &hdmi1 { > status = "okay"; > > diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi > b/arch/arm64/boot/dts/renesas/salvator-x.dtsi index > 5f0d4bdcd3b44aae..1f6b9fbb13af1ebf 100644 > --- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi > +++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi > @@ -294,6 +294,23 @@ > clock-frequency = <32768>; > }; > > +&hdmi0 { > + status = "okay"; > + > + ports { > + port@1 { > + reg = <1>; > + rcar_dw_hdmi0_out: endpoint { > + remote-endpoint = <&hdmi0_con>; > + }; > + }; > + }; > +}; > + > +&hdmi0_con { > + remote-endpoint = <&rcar_dw_hdmi0_out>; > +}; > + > &hsusb { > status = "okay"; > };
Hi Laurent, On Mon, May 15, 2017 at 2:29 PM, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > On Monday 15 May 2017 14:22:44 Geert Uytterhoeven wrote: >> The extensions to the first HDMI device and connector nodes apply to >> Salvator-X boards equipped with either an R-Car H3 or M3-W SoC. >> Hence move them from the R-Car H3 specific board file to the common >> Salvator-X board file. >> >> The second HDMI device and connector nodes are left as-is, as R-Car M3-W >> has only one HDMI output. >> >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > I wonder whether this is really worth it, given that the number of HDMI ports > is different between the two boards. I actually had similar patches in my tree > and then decided to drop them, as I found that splitting the H3 Salvator-X > HDMI ports salvator-x.dtsi and r8a7795-salvator-x.dts was getting pretty > confusing. I moved them because ES2.0 support required adding one other copy. When M3-W gets DU/HDMI support, we would need a third copy. I suppose H3ULCB and M3ULCB will receive DU/HDMI support, too. H3ULCB is available with H3 ES1.1 and ES2.0, so that means 3 more copies (instead of 1 in ulcb.dtsi). 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
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts index fcd9ca73f2c76768..22e5324e7ada0eea 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts @@ -58,23 +58,6 @@ status = "okay"; }; -&hdmi0 { - status = "okay"; - - ports { - port@1 { - reg = <1>; - rcar_dw_hdmi0_out: endpoint { - remote-endpoint = <&hdmi0_con>; - }; - }; - }; -}; - -&hdmi0_con { - remote-endpoint = <&rcar_dw_hdmi0_out>; -}; - &hdmi1 { status = "okay"; diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi b/arch/arm64/boot/dts/renesas/salvator-x.dtsi index 5f0d4bdcd3b44aae..1f6b9fbb13af1ebf 100644 --- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi +++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi @@ -294,6 +294,23 @@ clock-frequency = <32768>; }; +&hdmi0 { + status = "okay"; + + ports { + port@1 { + reg = <1>; + rcar_dw_hdmi0_out: endpoint { + remote-endpoint = <&hdmi0_con>; + }; + }; + }; +}; + +&hdmi0_con { + remote-endpoint = <&rcar_dw_hdmi0_out>; +}; + &hsusb { status = "okay"; };
The extensions to the first HDMI device and connector nodes apply to Salvator-X boards equipped with either an R-Car H3 or M3-W SoC. Hence move them from the R-Car H3 specific board file to the common Salvator-X board file. The second HDMI device and connector nodes are left as-is, as R-Car M3-W has only one HDMI output. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 17 ----------------- arch/arm64/boot/dts/renesas/salvator-x.dtsi | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-)