Renesas Lager: Device Tree entries for VIN HDMI input

Renesas Lager: Device Tree entries for VIN HDMI input

[William Towle]

  The patch series "HDMI and Composite capture on Lager...", here
	https://www.mail-archive.com/linux-media@vger.kernel.org/msg90650.html

  ...received a request for a re-post of its first two patches with an
additional Cc: to linux-sh@vger.kernel.org here:
	https://www.mail-archive.com/linux-media@vger.kernel.org/msg90748.html

  That selection follows, with subject lines:
	[PATCH 1/2] ARM: shmobile: lager dts: Add entries for VIN HDMI input
	[PATCH 2/2] ARM: shmobile: lager dts: specify default-input for

Cheers,
  Wills.

[PATCH 1/2] ARM: shmobile: lager dts: Add entries for VIN HDMI input support

[William Towle]

Add DT entries for vin0, vin0_pins, and adv7612

Signed-off-by: William Towle <william.towle@codethink.co.uk>
Signed-off-by: Rob Taylor <rob.taylor@codethink.co.uk>
---
 arch/arm/boot/dts/r8a7790-lager.dts |   41 ++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index e02b523..aec7db6 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -378,7 +378,12 @@
 		renesas,function = "usb2";
 	};
 
-	vin1_pins: vin {
+	vin0_pins: vin0 {
+		renesas,groups = "vin0_data24", "vin0_sync", "vin0_field", "vin0_clkenb", "vin0_clk";
+		renesas,function = "vin0";
+	};
+
+	vin1_pins: vin1 {
 		renesas,groups = "vin1_data8", "vin1_clk";
 		renesas,function = "vin1";
 	};
@@ -539,6 +544,18 @@
 		reg = <0x12>;
 	};
 
+	hdmi-in@4c {
+		compatible = "adi,adv7612";
+		reg = <0x4c>;
+		remote = <&vin0>;
+
+		port {
+			hdmi_in_ep: endpoint {
+				remote-endpoint = <&vin0ep0>;
+			};
+		};
+	};
+
 	composite-in@20 {
 		compatible = "adi,adv7180";
 		reg = <0x20>;
@@ -654,6 +671,28 @@
 	status = "okay";
 };
 
+/* HDMI video input */
+&vin0 {
+	pinctrl-0 = <&vin0_pins>;
+	pinctrl-names = "default";
+
+	status = "ok";
+
+	port {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		vin0ep0: endpoint {
+			remote-endpoint = <&hdmi_in_ep>;
+			bus-width = <24>;
+			hsync-active = <0>;
+			vsync-active = <0>;
+			pclk-sample = <1>;
+			data-active = <1>;
+		};
+	};
+};
+
 /* composite video input */
 &vin1 {
 	pinctrl-0 = <&vin1_pins>;
-- 
1.7.10.4

[PATCH 2/2] ARM: shmobile: lager dts: specify default-input for ADV7612

[William Towle]

Set 'default-input' property for ADV7612. Enables image/video capture
without the need to have userspace specifying routing.

Signed-off-by: Ian Molton <ian.molton@codethink.co.uk>
Tested-by: William Towle <william.towle@codethink.co.uk>
---
 arch/arm/boot/dts/r8a7790-lager.dts |    1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index aec7db6..e537052 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -552,6 +552,7 @@
 		port {
 			hdmi_in_ep: endpoint {
 				remote-endpoint = <&vin0ep0>;
+				default-input = <0>;
 			};
 		};
 	};
-- 
1.7.10.4

Re: [PATCH 1/2] ARM: shmobile: lager dts: Add entries for VIN HDMI input support

[Laurent Pinchart]

Hi William,

Thank you for the patch.

On Tuesday 28 July 2015 17:17:43 William Towle wrote:
> Add DT entries for vin0, vin0_pins, and adv7612
> 
> Signed-off-by: William Towle <william.towle@codethink.co.uk>
> Signed-off-by: Rob Taylor <rob.taylor@codethink.co.uk>
> ---
>  arch/arm/boot/dts/r8a7790-lager.dts |   41 +++++++++++++++++++++++++++++++-
>  1 file changed, 40 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
> b/arch/arm/boot/dts/r8a7790-lager.dts index e02b523..aec7db6 100644
> --- a/arch/arm/boot/dts/r8a7790-lager.dts
> +++ b/arch/arm/boot/dts/r8a7790-lager.dts
> @@ -378,7 +378,12 @@
>  		renesas,function = "usb2";
>  	};
> 
> -	vin1_pins: vin {
> +	vin0_pins: vin0 {
> +		renesas,groups = "vin0_data24", "vin0_sync", "vin0_field", 
"vin0_clkenb", "vin0_clk";

If I'm not mistaken the VI0_FIELD pin isn't used on Lager.

> +		renesas,function = "vin0";
> +	};
> +
> +	vin1_pins: vin1 {
>  		renesas,groups = "vin1_data8", "vin1_clk";
>  		renesas,function = "vin1";
>  	};
> @@ -539,6 +544,18 @@
>  		reg = <0x12>;
>  	};
> 
> +	hdmi-in@4c {
> +		compatible = "adi,adv7612";
> +		reg = <0x4c>;
> +		remote = <&vin0>;

There's no remote property documented in the adv7612 bindings as far as I 
know. And that's good, I don't think there should be one :-)

> +
> +		port {
> +			hdmi_in_ep: endpoint {
> +				remote-endpoint = <&vin0ep0>;
> +			};
> +		};
> +	};
> +
>  	composite-in@20 {
>  		compatible = "adi,adv7180";
>  		reg = <0x20>;
> @@ -654,6 +671,28 @@
>  	status = "okay";
>  };
> 
> +/* HDMI video input */
> +&vin0 {
> +	pinctrl-0 = <&vin0_pins>;
> +	pinctrl-names = "default";
> +
> +	status = "ok";
> +
> +	port {
> +		#address-cells = <1>;
> +		#size-cells = <0>;

If there's a single endpoint I don't think you need those two properties.

> +
> +		vin0ep0: endpoint {
> +			remote-endpoint = <&hdmi_in_ep>;
> +			bus-width = <24>;
> +			hsync-active = <0>;
> +			vsync-active = <0>;
> +			pclk-sample = <1>;
> +			data-active = <1>;
> +		};
> +	};
> +};
> +
>  /* composite video input */
>  &vin1 {
>  	pinctrl-0 = <&vin1_pins>;

-- 
Regards,

Laurent Pinchart

Re: [PATCH 2/2] ARM: shmobile: lager dts: specify default-input for ADV7612

[Laurent Pinchart]

Hi William,

Thank you for the patch.

On Tuesday 28 July 2015 17:17:44 William Towle wrote:
> Set 'default-input' property for ADV7612. Enables image/video capture
> without the need to have userspace specifying routing.
> 
> Signed-off-by: Ian Molton <ian.molton@codethink.co.uk>
> Tested-by: William Towle <william.towle@codethink.co.uk>
> ---
>  arch/arm/boot/dts/r8a7790-lager.dts |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
> b/arch/arm/boot/dts/r8a7790-lager.dts index aec7db6..e537052 100644
> --- a/arch/arm/boot/dts/r8a7790-lager.dts
> +++ b/arch/arm/boot/dts/r8a7790-lager.dts
> @@ -552,6 +552,7 @@
>  		port {
>  			hdmi_in_ep: endpoint {
>  				remote-endpoint = <&vin0ep0>;
> +				default-input = <0>;

The default property must be placed in the adv7612 node, not in the endpoint 
node.

It looks like I've missed the patch that added the property to the DT 
bindings. I would probably have complained about it, but now it's in :-/

Nevertheless, I think it would make sense for the driver to select the default 
input automatically when only one input is connected. I'd prefer a driver 
patch that implements that behaviour instead of adding the property to the 
Lager DT.

>  			};
>  		};
>  	};

-- 
Regards,

Laurent Pinchart