Skip to contentSkip to conversation

ARM: dts: da850-evm: vpif DT changes

PATCH Superseded Bartosz Golaszewski 1 participant 5 messages Feb 22, 2017 Device tree bindings

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover ARM: dts: da850-evm: vpif DT changes

This series adds necessary changes to make vpif work on the da850-evm board.

The first patch only contains whitespace error fixes.

The second patch add a pinctrl node for vpif display pins.

The third adds the UI expander node that is needed to select the video capture functionality.

The last patch extends the vpif node with an output port.

v1 -> v2:
- used enable-gpios property instead of gpio hogs
- renamed the UI expander
- corrected the commit message in patch 2/4

Bartosz Golaszewski (4):
ARM: dts: da850-evm: fix whitespace errors
ARM: dts: da850: add vpif video display pins
ARM: dts: da850-evm: add the UI expander node
ARM: dts: da850-evm: add the output port to the vpif node

 arch/arm/boot/dts/da850-evm.dts | 35 +++++++++++++++++++++++++----------
 arch/arm/boot/dts/da850.dtsi    | 25 ++++++++++++++++++++++---
 2 files changed, 47 insertions(+), 13 deletions(-)
Signature · 1 line
2.9.3
#1 lore raw

PATCH v2 1/4 ARM: dts: da850-evm: fix whitespace errors

The da850-evm dts file contains whitespace errors in the vpif node.

This patch fixes them.

---
 arch/arm/boot/dts/da850-evm.dts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/da850-evm.dts +5 -5
index 8c5671c..dece981 100644
@@ -302,14 +302,14 @@
 	/* VPIF capture port */
 	port {
 		vpif_ch0: endpoint at 0 {
-			  reg = <0>;
-			  bus-width = <8>;
+			reg = <0>;
+			bus-width = <8>;
 		};
 
 		vpif_ch1: endpoint at 1 {
-			  reg = <1>;
-			  bus-width = <8>;
-			  data-shift = <8>;
+			reg = <1>;
+			bus-width = <8>;
+			data-shift = <8>;
 		};
 	};
 };
Signature · 1 line
2.9.3
#2 lore raw

PATCH v2 2/4 ARM: dts: da850: add vpif video display pins

In reply to Bartosz Golaszewski

Add a new pinctrl sub-node for vpif display pins. Move VP_CLKIN3 and VP_CLKIN2 to the display node where they actually belong (vide section 36.2.2 of the OMAP-L138 technical reference manual).

---
 arch/arm/boot/dts/da850.dtsi | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
arch/arm/boot/dts/da850.dtsi +15 -2
index 92d633d..5150331 100644
@@ -216,8 +216,21 @@
 					0x3c 0x11111111 0xffffffff
 					/* VP_DIN[8..9] */
 					0x40 0x00000011 0x000000ff
-					/* VP_CLKIN3, VP_CLKIN2 */
-					0x4c 0x00010100 0x000f0f00
+				>;
+			};
+			vpif_display_pins: vpif_display_pins {
+				pinctrl-single,bits = <
+					/* VP_DOUT[2..7] */
+					0x40 0x11111100 0xffffff00
+					/* VP_DOUT[10..15,0..1] */
+					0x44 0x11111111 0xffffffff
+					/*  VP_DOUT[8..9] */
+					0x48 0x00000011 0x000000ff
+					/*
+					 * VP_CLKOUT3, VP_CLKIN3,
+					 * VP_CLKOUT2, VP_CLKIN2
+					 */
+					0x4c 0x00111100 0x00ffff00
 				>;
 			};
 		};
Signature · 1 line
2.9.3
#3 lore raw

PATCH v2 3/4 ARM: dts: da850-evm: add the UI expander node

In reply to Bartosz Golaszewski

We need the expander to be probed to allow the VPIF controller to receive interrupts from the video decoder.

---
 arch/arm/boot/dts/da850-evm.dts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
arch/arm/boot/dts/da850-evm.dts +5 -1
index dece981..3968a18 100644
@@ -9,6 +9,7 @@
  */
 /dts-v1/;
 #include "da850.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
 	compatible = "ti,da850-evm", "ti,da850";
@@ -78,7 +79,10 @@
 				DRVDD-supply = <&vbat>;
 				DVDD-supply = <&vbat>;
 			};
-
+			tca6416: gpio at 20 {
+				compatible = "ti,tca6416";
+				reg = <0x20>;
+			};
 		};
 		wdt: wdt at 21000 {
 			status = "okay";
Signature · 1 line
2.9.3
#4 lore raw

PATCH v2 4/4 ARM: dts: da850-evm: add the output port to the vpif node

In reply to Bartosz Golaszewski

Extend the vpif node with an output port with a single channel.

NOTE: this is still mostly just hardware description - the actual driver is registered using pdata-quirks. We need the node however for correct pin control function selection.

---
 arch/arm/boot/dts/da850-evm.dts | 19 +++++++++++++++----
 arch/arm/boot/dts/da850.dtsi    |  8 +++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)
arch/arm/boot/dts/da850-evm.dts +15 -4
index 3968a18..0298734 100644
@@ -300,20 +300,31 @@
 
 &vpif {
 	pinctrl-names = "default";
-	pinctrl-0 = <&vpif_capture_pins>;
+	pinctrl-0 = <&vpif_capture_pins>, <&vpif_display_pins>;
 	status = "okay";
 
+	enable-gpios = <&tca6416 7 GPIO_ACTIVE_HIGH
+			&tca6416 6 GPIO_ACTIVE_HIGH
+			&tca6416 5 GPIO_ACTIVE_LOW>;
+
 	/* VPIF capture port */
-	port {
-		vpif_ch0: endpoint at 0 {
+	port at 0 {
+		vpif_input_ch0: endpoint at 0 {
 			reg = <0>;
 			bus-width = <8>;
 		};
 
-		vpif_ch1: endpoint at 1 {
+		vpif_input_ch1: endpoint at 1 {
 			reg = <1>;
 			bus-width = <8>;
 			data-shift = <8>;
 		};
 	};
+
+	/* VPIF display port */
+	port at 1 {
+		vpif_output_ch0: endpoint {
+			bus-width = <8>;
+		};
+	};
 };
arch/arm/boot/dts/da850.dtsi +7 -1
index 5150331..c708155 100644
@@ -358,7 +358,13 @@
 			status = "disabled";
 
 			/* VPIF capture port */
-			port {
+			port at 0 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
+
+			/* VPIF display port */
+			port at 1 {
 				#address-cells = <1>;
 				#size-cells = <0>;
 			};
Signature · 1 line
2.9.3