1 files changed, 87 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 3b99ec25b748..1e1b05768cec 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -20,6 +20,10 @@
                 reg = <0x80000000 0x7F000000>; /* 2032 MB */
         };
 
+        aliases {
+                display0 = &hdmi0;
+        };
+
         vmmcsd_fixed: fixedregulator-mmcsd {
                 compatible = "regulator-fixed";
                 regulator-name = "vmmcsd_fixed";
@@ -51,6 +55,51 @@
                         default-state = "off";
                 };
         };
+
+        tpd12s015: encoder@0 {
+                compatible = "ti,tpd12s015";
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&tpd12s015_pins>;
+
+                gpios = <&gpio9 0 GPIO_ACTIVE_HIGH>,    /* TCA6424A P01, CT CP HPD */
+                        <&gpio9 1 GPIO_ACTIVE_HIGH>,    /* TCA6424A P00, LS OE */
+                        <&gpio7 1 GPIO_ACTIVE_HIGH>;    /* GPIO 193, HPD */
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+
+                                tpd12s015_in: endpoint@0 {
+                                        remote-endpoint = <&hdmi_out>;
+                                };
+                        };
+
+                        port@1 {
+                                reg = <1>;
+
+                                tpd12s015_out: endpoint@0 {
+                                        remote-endpoint = <&hdmi_connector_in>;
+                                };
+                        };
+                };
+        };
+
+        hdmi0: connector@0 {
+                compatible = "hdmi-connector";
+                label = "hdmi";
+
+                type = "b";
+
+                port {
+                        hdmi_connector_in: endpoint {
+                                remote-endpoint = <&tpd12s015_out>;
+                        };
+                };
+        };
 };
 
 &omap5_pmx_core {
@@ -183,6 +232,19 @@
                 >;
         };
 
+        dss_hdmi_pins: pinmux_dss_hdmi_pins {
+                pinctrl-single,pins = <
+                        0x0fc (PIN_INPUT_PULLUP | MUX_MODE0)    /* hdmi_cec.hdmi_cec */
+                        0x100 (PIN_INPUT | MUX_MODE0)   /* hdmi_ddc_scl.hdmi_ddc_scl */
+                        0x102 (PIN_INPUT | MUX_MODE0)   /* hdmi_ddc_sda.hdmi_ddc_sda */
+                >;
+        };
+
+        tpd12s015_pins: pinmux_tpd12s015_pins {
+                pinctrl-single,pins = <
+                        0x0fe (PIN_INPUT_PULLDOWN | MUX_MODE6)  /* hdmi_hpd.gpio7_193 */
+                >;
+        };
 };
 
 &omap5_pmx_wkup {
@@ -434,6 +496,13 @@
         pinctrl-0 = <&i2c5_pins>;
 
         clock-frequency = <400000>;
+
+        gpio9: gpio@22 {
+                compatible = "ti,tca6424";
+                reg = <0x22>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
 };
 
 &mcbsp3 {
@@ -491,3 +560,21 @@
 &cpu0 {
         cpu0-supply = <&smps123_reg>;
 };
+
+&dss {
+        status = "ok";
+};
+
+&hdmi {
+        status = "ok";
+        vdda-supply = <&ldo4_reg>;
+
+        pinctrl-names = "default";
+        pinctrl-0 = <&dss_hdmi_pins>;
+
+        port {
+                hdmi_out: endpoint {
+                        remote-endpoint = <&tpd12s015_in>;
+                };
+        };
+};