[PATCH v4 0/7] R-Car H3 HDMI output DT integration

[PATCH v4 0/7] 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 Simon's latest devel branch. Conflict
resolution led to the new 2/7 patch. For convenience, the patches are
available from

	git://linuxtv.org/pinchartl/media.git drm-next-dt-v4-20170510

Simon, this 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). Could you please apply these patches once you merge v4.12-rc1 in your
tree ?

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

Laurent Pinchart (5):
  arm64: dts: r8a7796: Add display placeholders
  arm64: dts: r8a7795: salvator-x: Add DU1 and DU2 external dot clocks
  arm64: dts: r8a7795: salvator-x: Add DU0 and DU3 external dot clocks
  arm64: dts: r8a7795: salvator-x: Add panel backlight support
  ARM: shmobile: dts: Switch to panel-lvds bindings for Mitsubishi
    panels

Ulrich Hecht (1):
  arm64: dts: 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.dtsi       |  50 +++++++++++
 arch/arm64/boot/dts/renesas/r8a7796.dtsi       |  22 +++++
 arch/arm64/boot/dts/renesas/salvator-x.dtsi    | 117 +++++++++++++++++++++++++
 5 files changed, 193 insertions(+), 2 deletions(-)

-- 
Regards,

Laurent Pinchart

[PATCH v4 1/7] arm64: dts: 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>
---
 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 50 ++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 7d87dff70ac8..fdcafe7a85c3 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -1789,11 +1789,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 {
@@ -1862,5 +1864,53 @@
 				};
 			};
 		};
+
+		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>;
+			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>;
+			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>;
+				};
+			};
+		};
 	};
 };
-- 
Regards,

Laurent Pinchart

[PATCH v4 2/7] arm64: dts: r8a7796: Add display placeholders

[Laurent Pinchart]

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
@@ -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 */
 
-- 
Regards,

Laurent Pinchart

[PATCH v4 3/7] arm64: dts: renesas: salvator-x: Enable HDMI outputs

[Laurent Pinchart]

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

Instantiate the HDMI connectors and enable the encoders.

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>
---
 arch/arm64/boot/dts/renesas/salvator-x.dtsi | 50 +++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
index d5eb022d247c..2cd0cce818e7 100644
--- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
@@ -151,6 +151,30 @@
 			  1800000 0>;
 	};
 
+	hdmi0-out {
+		compatible = "hdmi-connector";
+		label = "HDMI0 OUT";
+		type = "a";
+
+		port {
+			hdmi0_con: endpoint {
+				remote-endpoint = <&rcar_dw_hdmi0_out>;
+			};
+		};
+	};
+
+	hdmi1-out {
+		compatible = "hdmi-connector";
+		label = "HDMI1 OUT";
+		type = "a";
+
+		port {
+			hdmi1_con: endpoint {
+				remote-endpoint = <&rcar_dw_hdmi1_out>;
+			};
+		};
+	};
+
 	vga {
 		compatible = "vga-connector";
 
@@ -243,6 +267,32 @@
 	clock-frequency = <32768>;
 };
 
+&hdmi0 {
+	status = "okay";
+
+	ports {
+		port@1 {
+			reg = <1>;
+			rcar_dw_hdmi0_out: endpoint {
+				remote-endpoint = <&hdmi0_con>;
+			};
+		};
+	};
+};
+
+&hdmi1 {
+	status = "okay";
+
+	ports {
+		port@1 {
+			reg = <1>;
+			rcar_dw_hdmi1_out: endpoint {
+				remote-endpoint = <&hdmi1_con>;
+			};
+		};
+	};
+};
+
 &hsusb {
 	status = "okay";
 };
-- 
Regards,

Laurent Pinchart

[PATCH v4 4/7] arm64: dts: r8a7795: salvator-x: Add DU1 and DU2 external dot clocks

[Laurent Pinchart]

The DU1 and DU2 external dot clocks are fixed frequency clock generators
running at 33MHz.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm64/boot/dts/renesas/salvator-x.dtsi | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
index 2cd0cce818e7..884c63ebba69 100644
--- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
@@ -212,6 +212,19 @@
 		#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>;
+	};
 };
 
 &audio_clk_a {
@@ -238,6 +251,16 @@
 	pinctrl-names = "default";
 	status = "okay";
 
+	clocks = <&cpg CPG_MOD 724>,
+		 <&cpg CPG_MOD 723>,
+		 <&cpg CPG_MOD 722>,
+		 <&cpg CPG_MOD 721>,
+		 <&cpg CPG_MOD 727>,
+		 <&x21_clk>,
+		 <&x22_clk>;
+	clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
+		      "dclkin.1", "dclkin.2";
+
 	ports {
 		port@0 {
 			endpoint {
-- 
Regards,

Laurent Pinchart

[PATCH v4 5/7] arm64: dts: r8a7795: salvator-x: Add DU0 and DU3 external dot clocks

[Laurent Pinchart]

The clocks are generated by an I2C-controlled programmable clock
generator.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/salvator-x.dtsi | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
index 884c63ebba69..fd2f6fa523ae 100644
--- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
@@ -225,6 +225,12 @@
 		#clock-cells = <0>;
 		clock-frequency = <33000000>;
 	};
+
+	x23_clk: x23-clock {
+		compatible = "fixed-clock";
+		#clock-cells = <0>;
+		clock-frequency = <25000000>;
+	};
 };
 
 &audio_clk_a {
@@ -256,10 +262,12 @@
 		 <&cpg CPG_MOD 722>,
 		 <&cpg CPG_MOD 721>,
 		 <&cpg CPG_MOD 727>,
+		 <&versaclock5 1>,
 		 <&x21_clk>,
-		 <&x22_clk>;
+		 <&x22_clk>,
+		 <&versaclock5 2>;
 	clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
-		      "dclkin.1", "dclkin.2";
+		      "dclkin.0", "dclkin.1", "dclkin.2", "dclkin.3";
 
 	ports {
 		port@0 {
@@ -374,6 +382,20 @@
 	};
 };
 
+&i2c4 {
+	status = "okay";
+
+	clock-frequency = <100000>;
+
+	versaclock5: clock-generator@6a {
+		compatible = "idt,5p49v5923";
+		reg = <0x6a>;
+		#clock-cells = <1>;
+		clocks = <&x23_clk>;
+		clock-names = "xin";
+	};
+};
+
 &i2c_dvfs {
 	status = "okay";
 };
-- 
Regards,

Laurent Pinchart

[PATCH v4 6/7] arm64: dts: r8a7795: salvator-x: Add panel backlight support

[Laurent Pinchart]

The panel backlight is controlled through a GPIO and a PWM channel.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 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 fd2f6fa523ae..2e199302f93c 100644
--- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
+++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
@@ -58,6 +58,16 @@
 		clock-frequency = <11289600>;
 	};
 
+	backlight: backlight {
+		compatible = "pwm-backlight";
+		pwms = <&pwm1 0 50000>;
+
+		brightness-levels = <256 128 64 16 8 4 0>;
+		default-brightness-level = <6>;
+
+		enable-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;
+	};
+
 	reg_1p8v: regulator0 {
 		compatible = "regulator-fixed";
 		regulator-name = "fixed-1.8V";
@@ -453,6 +463,11 @@
 		function = "i2c2";
 	};
 
+	pwm1_pins: pwm {
+		groups = "pwm1_a";
+		function = "pwm1";
+	};
+
 	scif1_pins: scif1 {
 		groups = "scif1_data_a", "scif1_ctrl";
 		function = "scif1";
@@ -538,6 +553,13 @@
 	};
 };
 
+&pwm1 {
+	pinctrl-0 = <&pwm1_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
 &rcar_sound {
 	pinctrl-0 = <&sound_pins &sound_clk_pins>;
 	pinctrl-names = "default";
-- 
Regards,

Laurent Pinchart

[PATCH v4 7/7] 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 v4 1/7] arm64: dts: r8a7795: Add HDMI encoder support

[Geert Uytterhoeven]

Hi Laurent, Uli,

On Wed, May 10, 2017 at 9:04 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>
> ---
>  arch/arm64/boot/dts/renesas/r8a7795.dtsi | 50 ++++++++++++++++++++++++++++++++
>  1 file changed, 50 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> index 7d87dff70ac8..fdcafe7a85c3 100644
> --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> @@ -1789,11 +1789,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 {
> @@ -1862,5 +1864,53 @@
>                                 };
>                         };
>                 };
> +
> +               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>;

Missing "resets" property.

> +               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>;

Likewise.

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 v4 3/7] arm64: dts: renesas: salvator-x: Enable HDMI outputs

[Geert Uytterhoeven]

Hi Laurent, Uli,

On Wed, May 10, 2017 at 9:04 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
>
> Instantiate the HDMI connectors and enable the encoders.
>
> 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>
> ---
>  arch/arm64/boot/dts/renesas/salvator-x.dtsi | 50 +++++++++++++++++++++++++++++
>  1 file changed, 50 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> index d5eb022d247c..2cd0cce818e7 100644
> --- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> +++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> @@ -151,6 +151,30 @@
>                           1800000 0>;
>         };
>
> +       hdmi0-out {

Can you please respect sort order when inserting new nodes?
Thanks!

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 v4 5/7] arm64: dts: r8a7795: salvator-x: Add DU0 and DU3 external dot clocks

[Geert Uytterhoeven]

Hi Laurent,

On Wed, May 10, 2017 at 9:04 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The clocks are generated by an I2C-controlled programmable clock
> generator.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  arch/arm64/boot/dts/renesas/salvator-x.dtsi | 26 ++++++++++++++++++++++++--
>  1 file changed, 24 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> index 884c63ebba69..fd2f6fa523ae 100644
> --- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> +++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi

> @@ -374,6 +382,20 @@
>         };
>  };
>
> +&i2c4 {
> +       status = "okay";
> +
> +       clock-frequency = <100000>;
> +
> +       versaclock5: clock-generator@6a {
> +               compatible = "idt,5p49v5923";
> +               reg = <0x6a>;
> +               #clock-cells = <1>;
> +               clocks = <&x23_clk>;
> +               clock-names = "xin";
> +       };
> +};

Please merge this with the existing i2c4 block.

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 v4 2/7] arm64: dts: r8a7796: Add display placeholders

[Geert Uytterhoeven]

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

Re: [PATCH v4 4/7] arm64: dts: r8a7795: salvator-x: Add DU1 and DU2 external dot clocks

[Geert Uytterhoeven]

Hi Laurent,

On Wed, May 10, 2017 at 9:04 AM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> The DU1 and DU2 external dot clocks are fixed frequency clock generators
> running at 33MHz.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  arch/arm64/boot/dts/renesas/salvator-x.dtsi | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> index 2cd0cce818e7..884c63ebba69 100644
> --- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> +++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> @@ -212,6 +212,19 @@
>                 #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>;
> +       };
>  };
>
>  &audio_clk_a {
> @@ -238,6 +251,16 @@
>         pinctrl-names = "default";
>         status = "okay";
>
> +       clocks = <&cpg CPG_MOD 724>,
> +                <&cpg CPG_MOD 723>,
> +                <&cpg CPG_MOD 722>,
> +                <&cpg CPG_MOD 721>,
> +                <&cpg CPG_MOD 727>,
> +                <&x21_clk>,
> +                <&x22_clk>;
> +       clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
> +                     "dclkin.1", "dclkin.2";

Another H3 vs. M3-W oddity: DU_DOTCLKIN2 is wired to pin AR7 on H3 SiP,
and AR8 on M3-W SiP.
But crystal X22 is wired to AR7, and AR8 is not connected.
Hence on M3-W, "dclkin.2" is not available, cfr. "NC <M3SiP>" in the schematics.

So either the du clocks and -names should be overridden in
r8a7795-salvator.dtsi to add "dclkin.2", or in r8a7796-salvator.dtsi to
remove it.

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 v4 0/7] R-Car H3 HDMI output DT integration

[Simon Horman]

On Wed, May 10, 2017 at 10:04:51AM +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 Simon's latest devel branch. Conflict
> resolution led to the new 2/7 patch. For convenience, the patches are
> available from
> 
> 	git://linuxtv.org/pinchartl/media.git drm-next-dt-v4-20170510
> 
> Simon, this 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). Could you please apply these patches once you merge v4.12-rc1 in your
> tree ?

Yes, that sounds reasonable. I plan to rebase shortly after v4.12-rc1 is
released. Please feel free to ping me if I forget to queue these up at that
time.

> Koji Matsuoka (1):
>   arm64: dts: renesas: salvator-x: Enable HDMI outputs
> 
> Laurent Pinchart (5):
>   arm64: dts: r8a7796: Add display placeholders
>   arm64: dts: r8a7795: salvator-x: Add DU1 and DU2 external dot clocks
>   arm64: dts: r8a7795: salvator-x: Add DU0 and DU3 external dot clocks
>   arm64: dts: r8a7795: salvator-x: Add panel backlight support
>   ARM: shmobile: dts: Switch to panel-lvds bindings for Mitsubishi
>     panels
> 
> Ulrich Hecht (1):
>   arm64: dts: 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.dtsi       |  50 +++++++++++
>  arch/arm64/boot/dts/renesas/r8a7796.dtsi       |  22 +++++
>  arch/arm64/boot/dts/renesas/salvator-x.dtsi    | 117 +++++++++++++++++++++++++
>  5 files changed, 193 insertions(+), 2 deletions(-)
> 
> -- 
> Regards,
> 
> Laurent Pinchart
> 

Re: [PATCH v4 3/7] arm64: dts: renesas: salvator-x: Enable HDMI outputs

[Laurent Pinchart]

Hi Geert,

On Wednesday 10 May 2017 10:28:11 Geert Uytterhoeven wrote:
> On Wed, May 10, 2017 at 9:04 AM, Laurent Pinchart wrote:
> > From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> > 
> > Instantiate the HDMI connectors and enable the encoders.
> > 
> > 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>
> > ---
> > 
> >  arch/arm64/boot/dts/renesas/salvator-x.dtsi | 50 ++++++++++++++++++++++++
> >  1 file changed, 50 insertions(+)
> > 
> > diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> > b/arch/arm64/boot/dts/renesas/salvator-x.dtsi index
> > d5eb022d247c..2cd0cce818e7 100644
> > --- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> > @@ -151,6 +151,30 @@
> >                           1800000 0>;
> >         };
> > 
> > +       hdmi0-out {
> 
> Can you please respect sort order when inserting new nodes?
> Thanks!

Doesn't it make more sense to keep all display outputs grouped together 
instead of scattering them over the file ?

-- 
Regards,

Laurent Pinchart

Re: [PATCH v4 3/7] arm64: dts: renesas: salvator-x: Enable HDMI outputs

[Geert Uytterhoeven]

On Wed, May 10, 2017 at 1:52 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Wednesday 10 May 2017 10:28:11 Geert Uytterhoeven wrote:
>> On Wed, May 10, 2017 at 9:04 AM, Laurent Pinchart wrote:
>> > From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
>> >
>> > Instantiate the HDMI connectors and enable the encoders.
>> >
>> > 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>
>> > ---
>> >
>> >  arch/arm64/boot/dts/renesas/salvator-x.dtsi | 50 ++++++++++++++++++++++++
>> >  1 file changed, 50 insertions(+)
>> >
>> > diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
>> > b/arch/arm64/boot/dts/renesas/salvator-x.dtsi index
>> > d5eb022d247c..2cd0cce818e7 100644
>> > --- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
>> > +++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
>> > @@ -151,6 +151,30 @@
>> >                           1800000 0>;
>> >         };
>> >
>> > +       hdmi0-out {
>>
>> Can you please respect sort order when inserting new nodes?
>> Thanks!
>
> Doesn't it make more sense to keep all display outputs grouped together
> instead of scattering them over the file ?

Simon, what do you think?

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 v4 4/7] arm64: dts: r8a7795: salvator-x: Add DU1 and DU2 external dot clocks

[Laurent Pinchart]

Hi Geert,

On Wednesday 10 May 2017 10:57:04 Geert Uytterhoeven wrote:
> On Wed, May 10, 2017 at 9:04 AM, Laurent Pinchart wrote:
> > The DU1 and DU2 external dot clocks are fixed frequency clock generators
> > running at 33MHz.
> > 
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> > 
> >  arch/arm64/boot/dts/renesas/salvator-x.dtsi | 23 +++++++++++++++++++++++
> >  1 file changed, 23 insertions(+)
> > 
> > diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> > b/arch/arm64/boot/dts/renesas/salvator-x.dtsi index
> > 2cd0cce818e7..884c63ebba69 100644
> > --- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> > +++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> > @@ -212,6 +212,19 @@
> > 
> >                 #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>;
> > +       };
> > 
> >  };
> >  
> >  &audio_clk_a {
> > 
> > @@ -238,6 +251,16 @@
> > 
> >         pinctrl-names = "default";
> >         status = "okay";
> > 
> > +       clocks = <&cpg CPG_MOD 724>,
> > +                <&cpg CPG_MOD 723>,
> > +                <&cpg CPG_MOD 722>,
> > +                <&cpg CPG_MOD 721>,
> > +                <&cpg CPG_MOD 727>,
> > +                <&x21_clk>,
> > +                <&x22_clk>;
> > +       clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
> > +                     "dclkin.1", "dclkin.2";
> 
> Another H3 vs. M3-W oddity: DU_DOTCLKIN2 is wired to pin AR7 on H3 SiP,
> and AR8 on M3-W SiP.
> But crystal X22 is wired to AR7, and AR8 is not connected.
> Hence on M3-W, "dclkin.2" is not available, cfr. "NC <M3SiP>" in the
> schematics.

Indeed :-/ X22 is populated though. No wonder the board is expensive :-)

> So either the du clocks and -names should be overridden in
> r8a7795-salvator.dtsi to add "dclkin.2", or in r8a7796-salvator.dtsi to
> remove it.

Or specified differently in both. I'll do that, it would be confusing 
otherwise.

-- 
Regards,

Laurent Pinchart

Re: [PATCH v4 4/7] arm64: dts: r8a7795: salvator-x: Add DU1 and DU2 external dot clocks

[Geert Uytterhoeven]

Hi Laurent,

On Wed, May 10, 2017 at 2:29 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Wednesday 10 May 2017 10:57:04 Geert Uytterhoeven wrote:
>> On Wed, May 10, 2017 at 9:04 AM, Laurent Pinchart wrote:
>> > The DU1 and DU2 external dot clocks are fixed frequency clock generators
>> > running at 33MHz.
>> >
>> > Signed-off-by: Laurent Pinchart
>> > <laurent.pinchart+renesas@ideasonboard.com>
>> > ---
>> >
>> >  arch/arm64/boot/dts/renesas/salvator-x.dtsi | 23 +++++++++++++++++++++++
>> >  1 file changed, 23 insertions(+)
>> >
>> > diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
>> > b/arch/arm64/boot/dts/renesas/salvator-x.dtsi index
>> > 2cd0cce818e7..884c63ebba69 100644
>> > --- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
>> > +++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
>> > @@ -212,6 +212,19 @@
>> >
>> >                 #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>;
>> > +       };
>> >
>> >  };
>> >
>> >  &audio_clk_a {
>> >
>> > @@ -238,6 +251,16 @@
>> >
>> >         pinctrl-names = "default";
>> >         status = "okay";
>> >
>> > +       clocks = <&cpg CPG_MOD 724>,
>> > +                <&cpg CPG_MOD 723>,
>> > +                <&cpg CPG_MOD 722>,
>> > +                <&cpg CPG_MOD 721>,
>> > +                <&cpg CPG_MOD 727>,
>> > +                <&x21_clk>,
>> > +                <&x22_clk>;
>> > +       clock-names = "du.0", "du.1", "du.2", "du.3", "lvds.0",
>> > +                     "dclkin.1", "dclkin.2";
>>
>> Another H3 vs. M3-W oddity: DU_DOTCLKIN2 is wired to pin AR7 on H3 SiP,
>> and AR8 on M3-W SiP.
>> But crystal X22 is wired to AR7, and AR8 is not connected.
>> Hence on M3-W, "dclkin.2" is not available, cfr. "NC <M3SiP>" in the
>> schematics.
>
> Indeed :-/ X22 is populated though. No wonder the board is expensive :-)

And both crystals generate the same frequency. What's the point of that?
(repeat from Lager x2 == x13?).

>> So either the du clocks and -names should be overridden in
>> r8a7795-salvator.dtsi to add "dclkin.2", or in r8a7796-salvator.dtsi to
>> remove it.
>
> Or specified differently in both. I'll do that, it would be confusing
> otherwise.

That sounds indeed better. Thanks!

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 v4 3/7] arm64: dts: renesas: salvator-x: Enable HDMI outputs

[Simon Horman]

On Wed, May 10, 2017 at 02:13:00PM +0200, Geert Uytterhoeven wrote:
> On Wed, May 10, 2017 at 1:52 PM, Laurent Pinchart
> <laurent.pinchart@ideasonboard.com> wrote:
> > On Wednesday 10 May 2017 10:28:11 Geert Uytterhoeven wrote:
> >> On Wed, May 10, 2017 at 9:04 AM, Laurent Pinchart wrote:
> >> > From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
> >> >
> >> > Instantiate the HDMI connectors and enable the encoders.
> >> >
> >> > 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>
> >> > ---
> >> >
> >> >  arch/arm64/boot/dts/renesas/salvator-x.dtsi | 50 ++++++++++++++++++++++++
> >> >  1 file changed, 50 insertions(+)
> >> >
> >> > diff --git a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> >> > b/arch/arm64/boot/dts/renesas/salvator-x.dtsi index
> >> > d5eb022d247c..2cd0cce818e7 100644
> >> > --- a/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> >> > +++ b/arch/arm64/boot/dts/renesas/salvator-x.dtsi
> >> > @@ -151,6 +151,30 @@
> >> >                           1800000 0>;
> >> >         };
> >> >
> >> > +       hdmi0-out {
> >>
> >> Can you please respect sort order when inserting new nodes?
> >> Thanks!
> >
> > Doesn't it make more sense to keep all display outputs grouped together
> > instead of scattering them over the file ?
> 
> Simon, what do you think?

I tend to agree with Laurent here. I would, however, like the order to be
consistent in the case where similar nodes are in multiple files as it
makes it somewhat easier to make comparisons.

Re: [PATCH v4 0/7] R-Car H3 HDMI output DT integration

[Simon Horman]

On Wed, May 10, 2017 at 11:14:41AM +0200, Simon Horman wrote:
> On Wed, May 10, 2017 at 10:04:51AM +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 Simon's latest devel branch. Conflict
> > resolution led to the new 2/7 patch. For convenience, the patches are
> > available from
> > 
> > 	git://linuxtv.org/pinchartl/media.git drm-next-dt-v4-20170510
> > 
> > Simon, this 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). Could you please apply these patches once you merge v4.12-rc1 in your
> > tree ?
> 
> Yes, that sounds reasonable. I plan to rebase shortly after v4.12-rc1 is
> released. Please feel free to ping me if I forget to queue these up at that
> time.

Subsequently Geert offered some review. I'll be watching out for a v5 to
apply.