Merge tag 'v4.8-rc1' into patchwork

[linux-2.6-microblaze.git] / arch / arm / boot / dts / logicpd-torpedo-37xx-devkit.dts

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";