[PATCH 0/2] arm64: dts: salvator-x: Move HDMI0 to common Salvator-X board support

[PATCH 0/2] arm64: dts: salvator-x: Move HDMI0 to common Salvator-X board support

[Geert Uytterhoeven]

	Hi Simon, Magnus,

The extensions to the first HDMI device and connector nodes apply to
Salvator-X boards equipped with either an R-Car H3 (ES1.0 or ES2.0) or M3-W
SoC.
Hence move them from the R-Car H3 specific board file to the common
Salvator-X board file.

This requires adding a placeholder for hdmi0 to r8a7796.dtsi first.

Thanks!

Geert Uytterhoeven (2):
  arm64: dts: r8a7796: Add placeholder for HDMI device
  arm64: dts: r8a7795: salvator-x: Move HDMI0 to common Salvator-X board
    support

 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 17 -----------------
 arch/arm64/boot/dts/renesas/r8a7796.dtsi           |  9 +++++++++
 arch/arm64/boot/dts/renesas/salvator-x.dtsi        | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 17 deletions(-)

-- 
2.7.4

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

[PATCH 1/2] arm64: dts: r8a7796: Add placeholder for HDMI device

[Geert Uytterhoeven]

Add an empty device node with ports boilerplate serving as a placeholder
for the HDMI device.  HDMI is not yet supported and/or tested on R-Car
M3-W, but is supported and used on Salvator-X boards with an R-Car H3
SoC.  Hence a placeholder will allow common board support to refer to
it.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index b418a66f4ceccb90..892d956d1b1b565c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -1428,6 +1428,15 @@
 			/* placeholder */
 		};
 
+		hdmi0: hdmi0@fead0000 {
+			/* placeholder */
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+		};
+
 		du: display@feb00000 {
 			/* placeholder */
 
-- 
2.7.4

[PATCH 2/2] arm64: dts: r8a7795: salvator-x: Move HDMI0 to common Salvator-X board support

[Geert Uytterhoeven]

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(-)

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

Re: [PATCH 2/2] arm64: dts: r8a7795: salvator-x: Move HDMI0 to common Salvator-X board support

[Laurent Pinchart]

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";
>  };

-- 
Regards,

Laurent Pinchart

Re: [PATCH 2/2] arm64: dts: r8a7795: salvator-x: Move HDMI0 to common Salvator-X board support

[Geert Uytterhoeven]

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