diff mbox

[v2] ARM: dts: duovero-parlor: Add HDMI output

Message ID 1400663706-24104-1-git-send-email-florian.vaussard@epfl.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Florian Vaussard May 21, 2014, 9:15 a.m. UTC
Add the necessary DTS nodes to enable the micro-HDMI output on Parlor
board.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
---
v1->v2:
- Rebased on Tony's omap-for-v3.16/dt-v2
- Use OMAP4_IOPAD macro
- Use hpd pin as GPIO with hdmi-connector

 arch/arm/boot/dts/omap4-duovero-parlor.dts | 44 ++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

Comments

Tomi Valkeinen May 21, 2014, 12:03 p.m. UTC | #1
On 21/05/14 12:15, Florian Vaussard wrote:
> Add the necessary DTS nodes to enable the micro-HDMI output on Parlor
> board.
> 
> Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
> ---
> v1->v2:
> - Rebased on Tony's omap-for-v3.16/dt-v2
> - Use OMAP4_IOPAD macro
> - Use hpd pin as GPIO with hdmi-connector
> 
>  arch/arm/boot/dts/omap4-duovero-parlor.dts | 44 ++++++++++++++++++++++++++++++
>  1 file changed, 44 insertions(+)

Looks good to me.

 Tomi
Tony Lindgren May 21, 2014, 3:03 p.m. UTC | #2
* Tomi Valkeinen <tomi.valkeinen@ti.com> [140521 05:04]:
> On 21/05/14 12:15, Florian Vaussard wrote:
> > Add the necessary DTS nodes to enable the micro-HDMI output on Parlor
> > board.
> > 
> > Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
> > ---
> > v1->v2:
> > - Rebased on Tony's omap-for-v3.16/dt-v2
> > - Use OMAP4_IOPAD macro
> > - Use hpd pin as GPIO with hdmi-connector
> > 
> >  arch/arm/boot/dts/omap4-duovero-parlor.dts | 44 ++++++++++++++++++++++++++++++
> >  1 file changed, 44 insertions(+)
> 
> Looks good to me.

Assuming Tomi will queue the display dts file separately:

Acked-by: Tony Lindgren <tony@atomide.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/boot/dts/omap4-duovero-parlor.dts b/arch/arm/boot/dts/omap4-duovero-parlor.dts
index cd53a64..6dc84d9 100644
--- a/arch/arm/boot/dts/omap4-duovero-parlor.dts
+++ b/arch/arm/boot/dts/omap4-duovero-parlor.dts
@@ -15,6 +15,10 @@ 
 	model = "OMAP4430 Gumstix Duovero on Parlor";
 	compatible = "gumstix,omap4-duovero-parlor", "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
 
+	aliases {
+		display0 = &hdmi0;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 		led0 {
@@ -35,6 +39,21 @@ 
 			gpio-key,wakeup;
 		};
 	};
+
+	hdmi0: connector@0 {
+		compatible = "hdmi-connector";
+		label = "hdmi";
+
+		type = "d";
+
+		hpd-gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>;	/* gpio_63 */
+
+		port {
+			hdmi_connector_in: endpoint {
+				remote-endpoint = <&hdmi_out>;
+			};
+		};
+	};
 };
 
 &omap4_pmx_core {
@@ -77,6 +96,15 @@ 
 			OMAP4_IOPAD(0x070, PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_a24.gpio_48: amdix enabled */
 		>;
 	};
+
+	dss_hdmi_pins: pinmux_dss_hdmi_pins {
+		pinctrl-single,pins = <
+			OMAP4_IOPAD(0x098, PIN_INPUT | MUX_MODE3)		/* hdmi_hpd.gpio_63 */
+			OMAP4_IOPAD(0x09a, PIN_INPUT_PULLUP | MUX_MODE0)	/* hdmi_cec.hdmi_cec */
+			OMAP4_IOPAD(0x09c, PIN_INPUT_PULLUP | MUX_MODE0)	/* hdmi_ddc_scl.hdmi_ddc_scl */
+			OMAP4_IOPAD(0x09e, PIN_INPUT_PULLUP | MUX_MODE0)	/* hdmi_ddc_sda.hdmi_ddc_sda */
+		>;
+	};
 };
 
 &i2c2 {
@@ -143,4 +171,20 @@ 
 	};
 };
 
+&dss {
+	status = "ok";
+};
+
+&hdmi {
+	status = "ok";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&dss_hdmi_pins>;
+
+	port {
+		hdmi_out: endpoint {
+			remote-endpoint = <&hdmi_connector_in>;
+		};
+	};
+};