[PATCH v5 0/6] R-Car H3 HDMI output DT integration

[PATCH v5 0/6] R-Car H3 HDMI output DT integration

[Laurent Pinchart]

Hello,

This patch series contains all the DT changes needed to integrate HDMI output
support for the H3 Salvator-X board.

The patches have been rebased on top of a merge of Simon's latest devel branch
and v4.12-rc1, and have taken Geert's comments into account. For convenience,
they are available from

        git://linuxtv.org/pinchartl/media.git drm-next-dt-v5-20170513

Simon, this still depends on driver changes that were merged by Linus for
v4.12-rc1 (the checkpatch warnings related to unknown compatible strings will
then be gone). Again, please only apply these patches after you merge
v4.12-rc1 in your tree.

Koji Matsuoka (1):
  arm64: dts: renesas: r8a7795-salvator-x: Enable HDMI outputs

Laurent Pinchart (4):
  arm64: dts: renesas: salvator-x: Add DU external dot clock sources
  arm64: dts: renesas: salvator-x: Add HDMI output connectors
  arm64: dts: renesas: r8a7795-salvator-x: Add DU external dot clocks
  ARM: shmobile: dts: Switch to panel-lvds bindings for Mitsubishi
    panels

Ulrich Hecht (1):
  arm64: dts: renesas: r8a7795: Add HDMI encoder support

 arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi     |  3 +-
 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi     |  3 +-
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 48 ++++++++++++++++++++
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 52 ++++++++++++++++++++++
 arch/arm64/boot/dts/renesas/salvator-x.dtsi        | 49 ++++++++++++++++++++
 5 files changed, 153 insertions(+), 2 deletions(-)

-- 
Regards,

Laurent Pinchart

[PATCH v5 1/6] arm64: dts: renesas: r8a7795: Add HDMI encoder support

[Laurent Pinchart]

From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>

Add DT nodes for the two HDMI encoders in disabled state.

Based on work by Koji Matsuoka.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
Changes since v4:

- Added resets property
---
 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 52 ++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 7d87dff70ac8..1aad7433b460 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -1758,6 +1758,56 @@
 			renesas,fcp = <&fcpf2>;
 		};
 
+		hdmi0: hdmi0@fead0000 {
+			compatible = "renesas,r8a7795-hdmi", "renesas,rcar-gen3-hdmi";
+			reg = <0 0xfead0000 0 0x10000>;
+			interrupts = <0 389 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 729>, <&cpg CPG_CORE R8A7795_CLK_HDMI>;
+			clock-names = "iahb", "isfr";
+			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+			resets = <&cpg 729>;
+			status = "disabled";
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				port@0 {
+					reg = <0>;
+					dw_hdmi0_in: endpoint {
+						remote-endpoint = <&du_out_hdmi0>;
+					};
+				};
+				port@1 {
+					reg = <1>;
+				};
+			};
+		};
+
+		hdmi1: hdmi1@feae0000 {
+			compatible = "renesas,r8a7795-hdmi", "renesas,rcar-gen3-hdmi";
+			reg = <0 0xfeae0000 0 0x10000>;
+			interrupts = <0 436 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 728>, <&cpg CPG_CORE R8A7795_CLK_HDMI>;
+			clock-names = "iahb", "isfr";
+			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
+			resets = <&cpg 728>;
+			status = "disabled";
+
+			ports {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				port@0 {
+					reg = <0>;
+					dw_hdmi1_in: endpoint {
+						remote-endpoint = <&du_out_hdmi1>;
+					};
+				};
+				port@1 {
+					reg = <1>;
+				};
+			};
+		};
+
 		du: display@feb00000 {
 			compatible = "renesas,du-r8a7795";
 			reg = <0 0xfeb00000 0 0x80000>,
@@ -1789,11 +1839,13 @@
 				port@1 {
 					reg = <1>;
 					du_out_hdmi0: endpoint {
+						remote-endpoint = <&dw_hdmi0_in>;
 					};
 				};
 				port@2 {
 					reg = <2>;
 					du_out_hdmi1: endpoint {
+						remote-endpoint = <&dw_hdmi1_in>;
 					};
 				};
 				port@3 {
-- 
Regards,

Laurent Pinchart

[PATCH v5 2/6] arm64: dts: renesas: salvator-x: Add DU external dot clock sources

[Laurent Pinchart]

The DU1 and DU2 external dot clocks are fixed frequency clock generators
running at 33MHz, while the DU0 and DU3 external dot clocks are
generated by an I2C-controlled programmable clock generator.

All those clock generators are available on both the H3 and M3-W
Salvator-X boards. Add them to the salvator-x.dtsi file.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
Changes since v4:

- Split clocks to a new patch
- Merged the two i2c4 blocks
---
 arch/arm64/boot/dts/renesas/salvator-x.dtsi | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
index 551946bbbd9c..3fc60ba41229 100644
--- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
@@ -188,6 +188,25 @@
 		#clock-cells = <0>;
 		clock-frequency = <24576000>;
 	};
+
+	/* External DU dot clocks */
+	x21_clk: x21-clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <33000000>;
+	};
+
+	x22_clk: x22-clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <33000000>;
+	};
+
+	x23_clk: x23-clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <25000000>;
+	};
 };
 
 &audio_clk_a {
@@ -296,6 +315,14 @@
 &i2c4 {
 	status = "okay";
 
+	versaclock5: clock-generator@6a {
+		compatible = "idt,5p49v5923";
+		reg = <0x6a>;
+		#clock-cells = <1>;
+		clocks = <&x23_clk>;
+		clock-names = "xin";
+	};
+
 	csa_vdd: adc@7c {
 		compatible = "maxim,max9611";
 		reg = <0x7c>;
-- 
Regards,

Laurent Pinchart

[PATCH v5 3/6] arm64: dts: renesas: salvator-x: Add HDMI output connectors

[Laurent Pinchart]

The Salvator-X board has two HDMI output connectors. Add them to the
common salvator-x.dtsi.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
Changes since v4:

- Split connectors to a new patch
---
 arch/arm64/boot/dts/renesas/salvator-x.dtsi | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
index 3fc60ba41229..3434c7552fcc 100644
--- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
@@ -151,6 +151,28 @@
 			  1800000 0>;
 	};
 
+	hdmi0-out {
+		compatible = "hdmi-connector";
+		label = "HDMI0 OUT";
+		type = "a";
+
+		port {
+			hdmi0_con: endpoint {
+			};
+		};
+	};
+
+	hdmi1-out {
+		compatible = "hdmi-connector";
+		label = "HDMI1 OUT";
+		type = "a";
+
+		port {
+			hdmi1_con: endpoint {
+			};
+		};
+	};
+
 	vga {
 		compatible = "vga-connector";
 
-- 
Regards,

Laurent Pinchart

[PATCH v5 4/6] arm64: dts: renesas: r8a7795-salvator-x: Add DU external dot clocks

[Laurent Pinchart]

The DU1 and DU2 external dot clocks are provided by the fixed frequency
clock generators X21 and X22, while the DU0 and DU3 clocks are provided
by the programmable Versaclock5 clock generator.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
Changes since v4:

- Merged all DU clocks in a single patch
- Moved DU clocks to r8a7795-salvator-x.dtsi as they differ between H3
  and M3-W
---
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 52fce67df341..2a5358b8f229 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -40,6 +40,20 @@
 	};
 };
 
+&du {
+	clocks = <&cpg CPG_MOD 724>,
+		 <&cpg CPG_MOD 723>,
+		 <&cpg CPG_MOD 722>,
+		 <&cpg CPG_MOD 721>,
+		 <&cpg CPG_MOD 727>,
+		 <&versaclock5 1>,
+		 <&x21_clk>,
+		 <&x22_clk>,
+		 <&versaclock5 2>;
+	clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
+		      "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
+};
+
 &ehci2 {
 	status = "okay";
 };
-- 
Regards,

Laurent Pinchart

[PATCH v5 5/6] arm64: dts: renesas: r8a7795-salvator-x: Enable HDMI outputs

[Laurent Pinchart]

From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>

Enable the HDMI encoders for the H3 Salvator-X board. The number of
encoders varies between the H3 and M3-W SoCs, so they can't be enabled
in the common salvator-x.dtsi file.

Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
Changes since v4:

- Sort nodes alphabetically
- Move hdmi[01] nodes to r8a7795-salvator-x.dtsi
- Link the connectors to the encoders
---
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
index 2a5358b8f229..fcd9ca73f2c7 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
@@ -58,6 +58,40 @@
 	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";
+
+	ports {
+		port@1 {
+			reg = <1>;
+			rcar_dw_hdmi1_out: endpoint {
+				remote-endpoint = <&hdmi1_con>;
+			};
+		};
+	};
+};
+
+&hdmi1_con {
+	remote-endpoint = <&rcar_dw_hdmi1_out>;
+};
+
 &ohci2 {
 	status = "okay";
 };
-- 
Regards,

Laurent Pinchart

[PATCH v5 6/6] ARM: shmobile: dts: Switch to panel-lvds bindings for Mitsubishi panels

[Laurent Pinchart]

The aa104xd12 and aa121td01 panels are LVDS panels, not DPI panels.
Use the correct DT bindings.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi | 3 ++-
 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi b/arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi
index 65cb50f0c29f..238d14bb0ebe 100644
--- a/arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi
+++ b/arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi
@@ -10,10 +10,11 @@
 
 / {
 	panel {
-		compatible = "mitsubishi,aa104xd12", "panel-dpi";
+		compatible = "mitsubishi,aa104xd12", "panel-lvds";
 
 		width-mm = <210>;
 		height-mm = <158>;
+		data-mapping = "jeida-18";
 
 		panel-timing {
 			/* 1024x768 @65Hz */
diff --git a/arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi b/arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi
index a07ebf8f6938..04aafd479775 100644
--- a/arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi
+++ b/arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi
@@ -10,10 +10,11 @@
 
 / {
 	panel {
-		compatible = "mitsubishi,aa121td01", "panel-dpi";
+		compatible = "mitsubishi,aa121td01", "panel-lvds";
 
 		width-mm = <261>;
 		height-mm = <163>;
+		data-mapping = "jeida-18";
 
 		panel-timing {
 			/* 1280x800 @60Hz */
-- 
Regards,

Laurent Pinchart

Re: [PATCH v5 1/6] arm64: dts: renesas: r8a7795: Add HDMI encoder support

[Geert Uytterhoeven]

On Sun, May 14, 2017 at 1:16 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
>
> Add DT nodes for the two HDMI encoders in disabled state.
>
> Based on work by Koji Matsuoka.
>
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

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

Re: [PATCH v5 2/6] arm64: dts: renesas: salvator-x: Add DU external dot clock sources

[Geert Uytterhoeven]

On Sun, May 14, 2017 at 1:16 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The DU1 and DU2 external dot clocks are fixed frequency clock generators
> running at 33MHz, while the DU0 and DU3 external dot clocks are
> generated by an I2C-controlled programmable clock generator.
>
> All those clock generators are available on both the H3 and M3-W
> Salvator-X boards. Add them to the salvator-x.dtsi file.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

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

Re: [PATCH v5 3/6] arm64: dts: renesas: salvator-x: Add HDMI output connectors

[Geert Uytterhoeven]

On Sun, May 14, 2017 at 1:16 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The Salvator-X board has two HDMI output connectors. Add them to the
> common salvator-x.dtsi.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

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

Re: [PATCH v5 4/6] arm64: dts: renesas: r8a7795-salvator-x: Add DU external dot clocks

[Geert Uytterhoeven]

On Sun, May 14, 2017 at 1:16 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The DU1 and DU2 external dot clocks are provided by the fixed frequency
> clock generators X21 and X22, while the DU0 and DU3 clocks are provided
> by the programmable Versaclock5 clock generator.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

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

Re: [PATCH v5 5/6] arm64: dts: renesas: r8a7795-salvator-x: Enable HDMI outputs

[Geert Uytterhoeven]

On Sun, May 14, 2017 at 1:16 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
>
> Enable the HDMI encoders for the H3 Salvator-X board. The number of
> encoders varies between the H3 and M3-W SoCs, so they can't be enabled
> in the common salvator-x.dtsi file.
>
> Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

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

Re: [PATCH v5 6/6] ARM: shmobile: dts: Switch to panel-lvds bindings for Mitsubishi panels

[Geert Uytterhoeven]

On Sun, May 14, 2017 at 1:16 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The aa104xd12 and aa121td01 panels are LVDS panels, not DPI panels.
> Use the correct DT bindings.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

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

Re: [PATCH v5 0/6] R-Car H3 HDMI output DT integration

[Simon Horman]

On Sun, May 14, 2017 at 02:16:12AM +0300, Laurent Pinchart wrote:
> Hello,
> 
> This patch series contains all the DT changes needed to integrate HDMI output
> support for the H3 Salvator-X board.
> 
> The patches have been rebased on top of a merge of Simon's latest devel branch
> and v4.12-rc1, and have taken Geert's comments into account. For convenience,
> they are available from
> 
>         git://linuxtv.org/pinchartl/media.git drm-next-dt-v5-20170513
> 
> Simon, this still depends on driver changes that were merged by Linus for
> v4.12-rc1 (the checkpatch warnings related to unknown compatible strings will
> then be gone). Again, please only apply these patches after you merge
> v4.12-rc1 in your tree.

Thanks. Now that v4.12-rc1 has been released I have rebased by
arm64-dt-for-v4.13 branch on top of it. I plan to merge that into both
renesas-next and renesas-devel, and push later today.

Re: [PATCH v5 0/6] R-Car H3 HDMI output DT integration

[Simon Horman]

On Mon, May 15, 2017 at 08:52:56AM +0200, Simon Horman wrote:
> On Sun, May 14, 2017 at 02:16:12AM +0300, Laurent Pinchart wrote:
> > Hello,
> > 
> > This patch series contains all the DT changes needed to integrate HDMI output
> > support for the H3 Salvator-X board.
> > 
> > The patches have been rebased on top of a merge of Simon's latest devel branch
> > and v4.12-rc1, and have taken Geert's comments into account. For convenience,
> > they are available from
> > 
> >         git://linuxtv.org/pinchartl/media.git drm-next-dt-v5-20170513
> > 
> > Simon, this still depends on driver changes that were merged by Linus for
> > v4.12-rc1 (the checkpatch warnings related to unknown compatible strings will
> > then be gone). Again, please only apply these patches after you merge
> > v4.12-rc1 in your tree.
> 
> Thanks. Now that v4.12-rc1 has been released I have rebased by
> arm64-dt-for-v4.13 branch on top of it. I plan to merge that into both
> renesas-next and renesas-devel, and push later today.

I somehow forgot to say that I have queued up these patches in
the arm64-dt-for-v4.13 branch.