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 <[email protected]> --- 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"; }; -- 2.7.4
