Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[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 a976560..b153f60 100644 (file)
--- a/arch/arm/boot/dts/omap5-cm-t54.dts
+++ b/arch/arm/boot/dts/omap5-cm-t54.dts
@@ -11,9 +11,9 @@
        model = "CompuLab CM-T54";
        compatible = "compulab,omap5-cm-t54", "ti,omap5";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
-               reg = <0x80000000 0x7F000000>; /* 2048 MB */
+               reg = <0 0x80000000 0 0x7f000000>; /* 2048 MB */
        };
 
        aliases {
@@ -72,7 +72,7 @@
 
        leds {
                compatible = "gpio-leds";
-               led@1 {
+               led1 {
                        label = "Heartbeat";
                        gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>; /* gpio3_80 ACT_LED */
                        linux,default-trigger = "heartbeat";