Merge remote-tracking branches 'regulator/fix/email' and 'regulator/fix/qcom-smd...

[cascardo/linux.git] / arch / arm / boot / dts / omap5-cm-t54.dts

diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts
index 4d87d9c..a976560 100644 (file)
--- a/arch/arm/boot/dts/omap5-cm-t54.dts
+++ b/arch/arm/boot/dts/omap5-cm-t54.dts
@@ -112,7 +112,7 @@
                 };
         };
 
-       hdmi0: connector@0 {
+       hdmi0: connector0 {
                compatible = "hdmi-connector";
                label = "hdmi";
 
@@ -130,7 +130,7 @@
                };
        };
 
-       tfp410: encoder@0 {
+       tfp410: encoder0 {
                compatible = "ti,tfp410";
 
                ports {
@@ -140,7 +140,7 @@
                        port@0 {
                                reg = <0>;
 
-                               tfp410_in: endpoint@0 {
+                               tfp410_in: endpoint {
                                        remote-endpoint = <&dpi_dvi_out>;
                                };
                        };
@@ -148,14 +148,14 @@
                        port@1 {
                                reg = <1>;
 
-                               tfp410_out: endpoint@0 {
+                               tfp410_out: endpoint {
                                        remote-endpoint = <&dvi_connector_in>;
                                };
                        };
                };
        };
 
-       dvi0: connector@1 {
+       dvi0: connector1 {
                compatible = "dvi-connector";
                label = "dvi";
 
@@ -434,7 +434,7 @@
                        compatible = "ti,palmas-pmic";
                        interrupt-parent = <&palmas>;
                        interrupts = <14 IRQ_TYPE_NONE>;
-                       interrupt-name = "short-irq";
+                       interrupt-names = "short-irq";
 
                        ti,ldo6-vibrator;
 
@@ -646,12 +646,17 @@
        pinctrl-0 = <&dss_dpi_pins>;
 
        port {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
                dpi_dvi_out: endpoint@0 {
+                       reg = <0>;
                        remote-endpoint = <&tfp410_in>;
                        data-lines = <24>;
                };
 
                dpi_lcd_out: endpoint@1 {
+                       reg = <1>;
                        remote-endpoint = <&lcd_in>;
                        data-lines = <24>;
                };