Merge tag 'omap-for-v4.8/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kerne...

Second set of device tree updates for omaps for v4.8 merge window.
This is a series of dtc warning fixes when compiled with make W=2
from Javier Martinez Canillas <javier@osg.samsung.com>.

* tag 'omap-for-v4.8/dt-part2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits)
  ARM: dts: am57xx: sbc-am57x: remove unneded unit name
  ARM: dts: omap5-board-common: remove unneded unit names
  ARM: dts: omap5-cm-t54: remove unneded unit names and add reg properties
  ARM: dts: am437x: cm-t43: remove unneded unit names
  ARM: dts: am437x-gp-evm: remove unneded unit name
  ARM: dts: am43xx-epos-evm: remove unneded unit name
  ARM: dts: omap4-var-om44customboard: remove unneded unit name
  ARM: dts: omap4-sdp: remove unneded unit names
  ARM: dts: omap4-panda-common: remove unneded unit names
  ARM: dts: omap4-duovero-parlor: remove unneded unit name
  ARM: dts: omap3-thunder: remove unneded unit name
  ARM: dts: sbc-t3x30: remove unneded unit names
  ARM: dts: omap3-pandora-common: remove unneded unit name
  ARM: dts: omap3-overo-common-dvi: remove unneded unit names
  ARM: dts: omap3-igep0020-common: remove unneded unit names
  ARM: dts: omap3: overo: remove unneded unit names in display nodes
  ARM: dts: omap3-ha-lcd: remove unneeded unit name
  ARM: dts: omap3-gta04: remove unneeded unit names
  ARM: dts: omap3-devkit8000-lcd-common: remove unneeded unit names
  ARM: dts: omap3-devkit8000: remove unneeded unit names
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/am3517-craneboard.dts b/arch/arm/boot/dts/am3517-craneboard.dts
index cb7de1d..f9d8f39 100644 (file)
--- a/arch/arm/boot/dts/am3517-craneboard.dts
+++ b/arch/arm/boot/dts/am3517-craneboard.dts
@@ -20,7 +20,7 @@
                reg = <0x80000000 0x10000000>;  /* 256 MB */
        };
 
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts
index 84832bf..14677d5 100644 (file)
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -897,7 +897,7 @@
        pinctrl-0 = <&dss_pins>;
 
        port {
-               dpi_out: endpoint@0 {
+               dpi_out: endpoint {
                        remote-endpoint = <&lcd_in>;
                        data-lines = <24>;
                };

diff --git a/arch/arm/boot/dts/am437x-sbc-t43.dts b/arch/arm/boot/dts/am437x-sbc-t43.dts
index 5f750c0..d23260d 100644 (file)
--- a/arch/arm/boot/dts/am437x-sbc-t43.dts
+++ b/arch/arm/boot/dts/am437x-sbc-t43.dts
@@ -145,7 +145,7 @@
        pinctrl-0 = <&dss_pinctrl_default>;
 
        port {
-               dpi_lcd_out: endpoint@0 {
+               dpi_lcd_out: endpoint {
                        remote-endpoint = <&lcd_in>;
                        data-lines = <24>;
                };

diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 3549b8c..ad32e55 100644 (file)
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -754,7 +754,7 @@
        pinctrl-0 = <&dss_pins>;
 
        port {
-               dpi_out: endpoint@0 {
+               dpi_out: endpoint {
                        remote-endpoint = <&lcd_in>;
                        data-lines = <24>;
                };

diff --git a/arch/arm/boot/dts/am57xx-sbc-am57x.dts b/arch/arm/boot/dts/am57xx-sbc-am57x.dts
index 988e996..31f9be6 100644 (file)
--- a/arch/arm/boot/dts/am57xx-sbc-am57x.dts
+++ b/arch/arm/boot/dts/am57xx-sbc-am57x.dts
@@ -128,7 +128,7 @@
        vdda_video-supply = <&ldoln_reg>;
 
        port {
-               dpi_lcd_out: endpoint@0 {
+               dpi_lcd_out: endpoint {
                        remote-endpoint = <&lcd_in>;
                        data-lines = <24>;
                };

diff --git a/arch/arm/boot/dts/compulab-sb-som.dtsi b/arch/arm/boot/dts/compulab-sb-som.dtsi
index 93d7e23..4af1adf 100644 (file)
--- a/arch/arm/boot/dts/compulab-sb-som.dtsi
+++ b/arch/arm/boot/dts/compulab-sb-som.dtsi
@@ -40,7 +40,7 @@
                };
        };
 
-       hdmi_conn: connector@0 {
+       hdmi_conn: connector {
                compatible = "hdmi-connector";
                label = "hdmi";
 

diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
index 015f795..08cce17 100644 (file)
--- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
+++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts
@@ -72,7 +72,7 @@
                };
        };
 
-       pwm10: dmtimer-pwm@10 {
+       pwm10: dmtimer-pwm {
                compatible = "ti,omap-dmtimer-pwm";
                pinctrl-names = "default";
                pinctrl-0 = <&pwm_pins>;
@@ -147,7 +147,7 @@
                gpio = <&gpio5 27 GPIO_ACTIVE_HIGH>;    /* gpio155, lcd INI */
        };
 
-       lcd0: display@0 {
+       lcd0: display {
                compatible = "panel-dpi";
                label = "15";
                status = "okay";

diff --git a/arch/arm/boot/dts/omap24xx-clocks.dtsi b/arch/arm/boot/dts/omap24xx-clocks.dtsi
index ca73722..769a346 100644 (file)
--- a/arch/arm/boot/dts/omap24xx-clocks.dtsi
+++ b/arch/arm/boot/dts/omap24xx-clocks.dtsi
@@ -164,7 +164,7 @@
                clock-div = <1>;
        };
 
-       func_96m_ck: func_96m_ck {
+       func_96m_ck: func_96m_ck@540 {
                #clock-cells = <0>;
        };
 

diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 01e1e2d..8ffde06 100644 (file)
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -91,7 +91,7 @@
                vcc-supply = <&hsusb2_power>;
        };
 
-       tfp410: encoder@0 {
+       tfp410: encoder0 {
                compatible = "ti,tfp410";
                powerdown-gpios = <&twl_gpio 2 GPIO_ACTIVE_LOW>;
 
@@ -104,7 +104,7 @@
                        port@0 {
                                reg = <0>;
 
-                               tfp410_in: endpoint@0 {
+                               tfp410_in: endpoint {
                                        remote-endpoint = <&dpi_out>;
                                };
                        };
@@ -112,14 +112,14 @@
                        port@1 {
                                reg = <1>;
 
-                               tfp410_out: endpoint@0 {
+                               tfp410_out: endpoint {
                                        remote-endpoint = <&dvi_connector_in>;
                                };
                        };
                };
        };
 
-       dvi0: connector@0 {
+       dvi0: connector0 {
                compatible = "dvi-connector";
                label = "dvi";
 
@@ -134,7 +134,7 @@
                };
        };
 
-       tv0: connector@1 {
+       tv0: connector1 {
                compatible = "svideo-connector";
                label = "tv";
 

diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index a4deff0..a19d907 100644 (file)
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -85,7 +85,7 @@
 
        };
 
-       tfp410: encoder@0 {
+       tfp410: encoder0 {
                compatible = "ti,tfp410";
                powerdown-gpios = <&gpio6 10 GPIO_ACTIVE_LOW>;  /* gpio_170 */
 
@@ -99,7 +99,7 @@
                        port@0 {
                                reg = <0>;
 
-                               tfp410_in: endpoint@0 {
+                               tfp410_in: endpoint {
                                        remote-endpoint = <&dpi_out>;
                                };
                        };
@@ -107,14 +107,14 @@
                        port@1 {
                                reg = <1>;
 
-                               tfp410_out: endpoint@0 {
+                               tfp410_out: endpoint {
                                        remote-endpoint = <&dvi_connector_in>;
                                };
                        };
                };
        };
 
-       dvi0: connector@0 {
+       dvi0: connector0 {
                compatible = "dvi-connector";
                label = "dvi";
 
@@ -129,7 +129,7 @@
                };
        };
 
-       tv0: connector@1 {
+       tv0: connector1 {
                compatible = "svideo-connector";
                label = "tv";
 

diff --git a/arch/arm/boot/dts/omap3-cm-t3x.dtsi b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
index a8127bc..6a0df13 100644 (file)
--- a/arch/arm/boot/dts/omap3-cm-t3x.dtsi
+++ b/arch/arm/boot/dts/omap3-cm-t3x.dtsi
@@ -57,7 +57,7 @@
                regulator-max-microvolt = <3300000>;
        };
 
-       tv0: connector@1 {
+       tv0: connector {
                compatible = "svideo-connector";
                label = "tv";
 

diff --git a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index b1b8ebf..5860101 100644 (file)
--- a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@ -68,7 +68,7 @@
                };
        };
 
-       tfp410: encoder@0 {
+       tfp410: encoder0 {
                compatible = "ti,tfp410";
                powerdown-gpios = <&twl_gpio 7 GPIO_ACTIVE_LOW>;
 
@@ -79,7 +79,7 @@
                        port@0 {
                                reg = <0>;
 
-                               tfp410_in: endpoint@0 {
+                               tfp410_in: endpoint {
                                        remote-endpoint = <&dpi_dvi_out>;
                                };
                        };
@@ -87,14 +87,14 @@
                        port@1 {
                                reg = <1>;
 
-                               tfp410_out: endpoint@0 {
+                               tfp410_out: endpoint {
                                        remote-endpoint = <&dvi_connector_in>;
                                };
                        };
                };
        };
 
-       dvi0: connector@0 {
+       dvi0: connector0 {
                compatible = "dvi-connector";
                label = "dvi";
 
@@ -109,7 +109,7 @@
                };
        };
 
-       tv0: connector@1 {
+       tv0: connector1 {
                compatible = "svideo-connector";
                label = "tv";
 
@@ -352,7 +352,7 @@
        vdda_dac-supply = <&vdac>;
 
        port {
-               dpi_dvi_out: endpoint@0 {
+               dpi_dvi_out: endpoint {
                        remote-endpoint = <&tfp410_in>;
                        data-lines = <24>;
                };

diff --git a/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi b/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
index 738910d..2d64bcf 100644 (file)
--- a/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
+++ b/arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi
@@ -14,7 +14,7 @@
                display2 = &tv0;
        };
 
-       lcd0: display@0 {
+       lcd0: display {
                compatible = "panel-dpi";
                label = "lcd";
 
@@ -30,7 +30,7 @@
 
 &dss {
        port {
-               dpi_lcd_out: endpoint@1 {
+               dpi_lcd_out: endpoint {
                        remote-endpoint = <&lcd_in>;
                        data-lines = <24>;
                };

diff --git a/arch/arm/boot/dts/omap3-devkit8000-lcd43.dts b/arch/arm/boot/dts/omap3-devkit8000-lcd43.dts
index d570535..d8b1639 100644 (file)
--- a/arch/arm/boot/dts/omap3-devkit8000-lcd43.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000-lcd43.dts
@@ -16,7 +16,7 @@
        model = "TimLL OMAP3 Devkit8000 with 4.3'' LCD panel";
        compatible = "timll,omap3-devkit8000", "ti,omap3";
 
-       lcd0: display@0 {
+       lcd0: display {
                panel-timing {
                        clock-frequency = <10164705>;
                        hactive = <480>;

diff --git a/arch/arm/boot/dts/omap3-devkit8000-lcd70.dts b/arch/arm/boot/dts/omap3-devkit8000-lcd70.dts
index 4afad4b..edb37ba 100644 (file)
--- a/arch/arm/boot/dts/omap3-devkit8000-lcd70.dts
+++ b/arch/arm/boot/dts/omap3-devkit8000-lcd70.dts
@@ -16,7 +16,7 @@
        model = "TimLL OMAP3 Devkit8000 with 7.0'' LCD panel";
        compatible = "timll,omap3-devkit8000", "ti,omap3";
 
-       lcd0: display@0 {
+       lcd0: display {
                panel-timing {
                        clock-frequency = <40000000>;
                        hactive = <800>;

diff --git a/arch/arm/boot/dts/omap3-gta04.dtsi b/arch/arm/boot/dts/omap3-gta04.dtsi
index 3eb53bc..c09a057 100644 (file)
--- a/arch/arm/boot/dts/omap3-gta04.dtsi
+++ b/arch/arm/boot/dts/omap3-gta04.dtsi
@@ -110,7 +110,7 @@
                pinctrl-0 = <&backlight_pins>;
        };
 
-       pwm11: dmtimer-pwm@11 {
+       pwm11: dmtimer-pwm {
                compatible = "ti,omap-dmtimer-pwm";
                ti,timers = <&timer11>;
                #pwm-cells = <3>;
@@ -121,7 +121,7 @@
                reset-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
        };
 
-       tv0: connector@1 {
+       tv0: connector {
                compatible = "svideo-connector";
                label = "tv";
 
@@ -142,14 +142,14 @@
 
                        port@0 {
                                reg = <0>;
-                               opa_in: endpoint@0 {
+                               opa_in: endpoint {
                                        remote-endpoint = <&venc_out>;
                                };
                        };
 
                        port@1 {
                                reg = <1>;
-                               opa_out: endpoint@0 {
+                               opa_out: endpoint {
                                        remote-endpoint = <&tv_connector_in>;
                                };
                        };

diff --git a/arch/arm/boot/dts/omap3-ha-lcd.dts b/arch/arm/boot/dts/omap3-ha-lcd.dts
index 11aa28d..60af7c2 100644 (file)
--- a/arch/arm/boot/dts/omap3-ha-lcd.dts
+++ b/arch/arm/boot/dts/omap3-ha-lcd.dts
@@ -121,7 +121,7 @@
                display0 = &lcd0;
        };
 
-       lcd0: display@0 {
+       lcd0: display {
                compatible = "panel-dpi";
                label = "lcd";
 

diff --git a/arch/arm/boot/dts/omap3-igep0020-common.dtsi b/arch/arm/boot/dts/omap3-igep0020-common.dtsi
index d6f839c..6af8154 100644 (file)
--- a/arch/arm/boot/dts/omap3-igep0020-common.dtsi
+++ b/arch/arm/boot/dts/omap3-igep0020-common.dtsi
@@ -60,7 +60,7 @@
                vcc-supply = <&hsusb1_power>;
        };
 
-       tfp410: encoder@0 {
+       tfp410: encoder {
                compatible = "ti,tfp410";
                powerdown-gpios = <&gpio6 10 GPIO_ACTIVE_LOW>; /* gpio_170 */
 
@@ -71,7 +71,7 @@
                        port@0 {
                                reg = <0>;
 
-                               tfp410_in: endpoint@0 {
+                               tfp410_in: endpoint {
                                        remote-endpoint = <&dpi_out>;
                                };
                        };
@@ -79,14 +79,14 @@
                        port@1 {
                                reg = <1>;
 
-                               tfp410_out: endpoint@0 {
+                               tfp410_out: endpoint {
                                        remote-endpoint = <&dvi_connector_in>;
                                };
                        };
                };
        };
 
-       dvi0: connector@0 {
+       dvi0: connector {
                compatible = "dvi-connector";
                label = "dvi";
 

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 0ceff5d..cac9a8b 100644 (file)
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -144,7 +144,7 @@
                io-channel-names = "temp", "bsi", "vbat";
        };
 
-       pwm9: dmtimer-pwm@9 {
+       pwm9: dmtimer-pwm {
                compatible = "ti,omap-dmtimer-pwm";
                #pwm-cells = <3>;
                ti,timers = <&timer9>;

diff --git a/arch/arm/boot/dts/omap3-overo-common-dvi.dtsi b/arch/arm/boot/dts/omap3-overo-common-dvi.dtsi
index 802f704..ae5564a 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-common-dvi.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-common-dvi.dtsi
@@ -69,7 +69,7 @@
                display0 = &dvi0;
        };
 
-       tfp410: encoder@0 {
+       tfp410: encoder {
                compatible = "ti,tfp410";
 
                ports {
@@ -79,7 +79,7 @@
                        port@0 {
                                reg = <0>;
 
-                               tfp410_in: endpoint@0 {
+                               tfp410_in: endpoint {
                                        remote-endpoint = <&dpi_out>;
                                };
                        };
@@ -87,14 +87,14 @@
                        port@1 {
                                reg = <1>;
 
-                               tfp410_out: endpoint@0 {
+                               tfp410_out: endpoint {
                                        remote-endpoint = <&dvi_connector_in>;
                                };
                        };
                };
        };
 
-       dvi0: connector@0 {
+       dvi0: connector {
                compatible = "dvi-connector";
                label = "dvi";
 

diff --git a/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi b/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
index 6314da2..ca86da6 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
@@ -119,7 +119,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&mcspi1_pins>;
 
-       lcd0: display@0 {
+       lcd0: display {
                compatible = "lgphilips,lb035q02";
                label = "lcd35";
 

diff --git a/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi b/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
index 7e3fe85..b0753ef 100644 (file)
--- a/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
+++ b/arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
@@ -96,7 +96,7 @@
                display0 = &lcd0;
        };
 
-       lcd0: display@0 {
+       lcd0: display {
                compatible = "samsung,lte430wq-f0c", "panel-dpi";
                label = "lcd43";
 

diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index bcf39d6..dbc4dc7 100644 (file)
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -27,7 +27,7 @@
                display0 = &lcd;
        };
 
-       tv: connector@1 {
+       tv: connector {
                compatible = "connector-analog-tv";
                label = "tv";
 

diff --git a/arch/arm/boot/dts/omap3-sb-t35.dtsi b/arch/arm/boot/dts/omap3-sb-t35.dtsi
index 827f614..73643fa 100644 (file)
--- a/arch/arm/boot/dts/omap3-sb-t35.dtsi
+++ b/arch/arm/boot/dts/omap3-sb-t35.dtsi
@@ -3,7 +3,7 @@
  */
 
 / {
-       tfp410: encoder@0 {
+       tfp410: encoder {
                compatible = "ti,tfp410";
 
                powerdown-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;  /* gpio_54 */
@@ -18,7 +18,7 @@
                        port@0 {
                                reg = <0>;
 
-                               tfp410_in: endpoint@0 {
+                               tfp410_in: endpoint {
                                        remote-endpoint = <&dpi_out>;
                                };
                        };
@@ -26,14 +26,14 @@
                        port@1 {
                                reg = <1>;
 
-                               tfp410_out: endpoint@0 {
+                               tfp410_out: endpoint {
                                        remote-endpoint = <&dvi_connector_in>;
                                };
                        };
                };
        };
 
-       dvi0: connector@0 {
+       dvi0: connector {
                compatible = "dvi-connector";
                label = "dvi";
 

diff --git a/arch/arm/boot/dts/omap3-thunder.dts b/arch/arm/boot/dts/omap3-thunder.dts
index d659515..9736ba7 100644 (file)
--- a/arch/arm/boot/dts/omap3-thunder.dts
+++ b/arch/arm/boot/dts/omap3-thunder.dts
@@ -85,7 +85,7 @@
                display0 = &lcd0;
        };
 
-       lcd0: display@0 {
+       lcd0: display {
                compatible = "samsung,lte430wq-f0c", "panel-dpi";
                label = "lcd";
 

diff --git a/arch/arm/boot/dts/omap4-duovero-parlor.dts b/arch/arm/boot/dts/omap4-duovero-parlor.dts
index 06c5482..6b39808 100644 (file)
--- a/arch/arm/boot/dts/omap4-duovero-parlor.dts
+++ b/arch/arm/boot/dts/omap4-duovero-parlor.dts
@@ -40,7 +40,7 @@
                };
        };
 
-       hdmi0: connector@0 {
+       hdmi0: connector {
                compatible = "hdmi-connector";
                label = "hdmi";
 

diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index e1d606f..f8f1395 100644 (file)
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -103,7 +103,7 @@
                enable-active-high;
        };
 
-       tfp410: encoder@0 {
+       tfp410: encoder0 {
                compatible = "ti,tfp410";
                powerdown-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;   /* gpio_0 */
 
@@ -114,7 +114,7 @@
                        port@0 {
                                reg = <0>;
 
-                               tfp410_in: endpoint@0 {
+                               tfp410_in: endpoint {
                                        remote-endpoint = <&dpi_out>;
                                };
                        };
@@ -122,14 +122,14 @@
                        port@1 {
                                reg = <1>;
 
-                               tfp410_out: endpoint@0 {
+                               tfp410_out: endpoint {
                                        remote-endpoint = <&dvi_connector_in>;
                                };
                        };
                };
        };
 
-       dvi0: connector@0 {
+       dvi0: connector0 {
                compatible = "dvi-connector";
                label = "dvi";
 
@@ -144,7 +144,7 @@
                };
        };
 
-       tpd12s015: encoder@1 {
+       tpd12s015: encoder1 {
                compatible = "ti,tpd12s015";
 
                gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>,   /* 60, CT CP HPD */
@@ -158,7 +158,7 @@
                        port@0 {
                                reg = <0>;
 
-                               tpd12s015_in: endpoint@0 {
+                               tpd12s015_in: endpoint {
                                        remote-endpoint = <&hdmi_out>;
                                };
                        };
@@ -166,14 +166,14 @@
                        port@1 {
                                reg = <1>;
 
-                               tpd12s015_out: endpoint@0 {
+                               tpd12s015_out: endpoint {
                                        remote-endpoint = <&hdmi_connector_in>;
                                };
                        };
                };
        };
 
-       hdmi0: connector@1 {
+       hdmi0: connector1 {
                compatible = "hdmi-connector";
                label = "hdmi";
 

diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 7e6cd2d..10d73a7 100644 (file)
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -160,7 +160,7 @@
                enable-active-high;
        };
 
-       tpd12s015: encoder@0 {
+       tpd12s015: encoder {
                compatible = "ti,tpd12s015";
 
                gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>,   /* 60, CT CP HPD */
@@ -174,7 +174,7 @@
                        port@0 {
                                reg = <0>;
 
-                               tpd12s015_in: endpoint@0 {
+                               tpd12s015_in: endpoint {
                                        remote-endpoint = <&hdmi_out>;
                                };
                        };
@@ -182,14 +182,14 @@
                        port@1 {
                                reg = <1>;
 
-                               tpd12s015_out: endpoint@0 {
+                               tpd12s015_out: endpoint {
                                        remote-endpoint = <&hdmi_connector_in>;
                                };
                        };
                };
        };
 
-       hdmi0: connector@0 {
+       hdmi0: connector {
                compatible = "hdmi-connector";
                label = "hdmi";
 

diff --git a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi
index 6e278d7..74940b6 100644 (file)
--- a/arch/arm/boot/dts/omap4-var-om44customboard.dtsi
+++ b/arch/arm/boot/dts/omap4-var-om44customboard.dtsi
@@ -45,7 +45,7 @@
                };
        };
 
-       hdmi0: connector@0 {
+       hdmi0: connector {
                compatible = "hdmi-connector";
                pinctrl-names = "default";
                pinctrl-0 = <&hdmi_hpd_pins>;

diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
index b95b221..f73934e 100644 (file)
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -64,7 +64,7 @@
                };
        };
 
-       tpd12s015: encoder@0 {
+       tpd12s015: encoder {
                compatible = "ti,tpd12s015";
 
                pinctrl-names = "default";
@@ -79,7 +79,7 @@
                        port@0 {
                                reg = <0>;
 
-                               tpd12s015_in: endpoint@0 {
+                               tpd12s015_in: endpoint {
                                        remote-endpoint = <&hdmi_out>;
                                };
                        };
@@ -87,14 +87,14 @@
                        port@1 {
                                reg = <1>;
 
-                               tpd12s015_out: endpoint@0 {
+                               tpd12s015_out: endpoint {
                                        remote-endpoint = <&hdmi_connector_in>;
                                };
                        };
                };
        };
 
-       hdmi0: connector@0 {
+       hdmi0: connector {
                compatible = "hdmi-connector";
                label = "hdmi";
 

diff --git a/arch/arm/boot/dts/omap5-cm-t54.dts b/arch/arm/boot/dts/omap5-cm-t54.dts
index 93fdfa9..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";
 
@@ -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>;
                };