Merge tag 'imx-dt-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...

[cascardo/linux.git] / arch / arm / boot / dts / am57xx-beagle-x15.dts

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index c4d04c5..9067ca0 100644 (file)
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -23,7 +23,7 @@
                display0 = &hdmi0;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };
@@ -62,28 +62,28 @@
                pinctrl-names = "default";
                pinctrl-0 = <&leds_pins_default>;
 
-               led@0 {
+               led0 {
                        label = "beagle-x15:usr0";
                        gpios = <&gpio7 9 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                        default-state = "off";
                };
 
-               led@1 {
+               led1 {
                        label = "beagle-x15:usr1";
                        gpios = <&gpio7 8 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "cpu0";
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "beagle-x15:usr2";
                        gpios = <&gpio7 14 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "mmc0";
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "beagle-x15:usr3";
                        gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "disk-activity";