| Message ID | 20170510070458.21193-3-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Simon Horman |
| Headers | show |
Hi Laurent, On Wed, May 10, 2017 at 9:04 AM, Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> wrote: > HDMI output and panel backlight for Salvator-X will be enabled for both > the H3 and M3-W boards in salvator-x.dtsi. The file will need to > reference SoC DT nodes that are not available for M3-W yet. Add > placeholders to avoid breaking compilation. > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > arch/arm64/boot/dts/renesas/r8a7796.dtsi | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi > index 60a4289d0b14..60d12e418f66 100644 > --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi > +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi > @@ -1131,6 +1135,24 @@ > /* placeholder */ > }; > > + hdmi0: hdmi0@fead0000 { > + /* placeholder */ > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + }; > + }; > + > + hdmi1: hdmi1@feae0000 { > + /* placeholder */ > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + }; > + }; R-Car M3-W does not have the second HDMI channel. Hence I think you should not add a placeholder, but instead move the H3-specific parts from salvator-x.dtsi to r8a7795-salvator-x.dts, like I did for SATA and the second USB host channel. 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/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi index 60a4289d0b14..60d12e418f66 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi @@ -510,6 +510,10 @@ status = "disabled"; }; + pwm1: pwm@e6e31000 { + /* placeholder */ + }; + can0: can@e6c30000 { compatible = "renesas,can-r8a7796", "renesas,rcar-gen3-can"; @@ -1131,6 +1135,24 @@ /* placeholder */ }; + hdmi0: hdmi0@fead0000 { + /* placeholder */ + + ports { + #address-cells = <1>; + #size-cells = <0>; + }; + }; + + hdmi1: hdmi1@feae0000 { + /* placeholder */ + + ports { + #address-cells = <1>; + #size-cells = <0>; + }; + }; + du: display@feb00000 { /* placeholder */
HDMI output and panel backlight for Salvator-X will be enabled for both the H3 and M3-W boards in salvator-x.dtsi. The file will need to reference SoC DT nodes that are not available for M3-W yet. Add placeholders to avoid breaking compilation. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)