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

[cascardo/linux.git] / arch / arm / boot / dts / omap3-pandora-common.dtsi

diff --git a/arch/arm/boot/dts/omap3-pandora-common.dtsi b/arch/arm/boot/dts/omap3-pandora-common.dtsi
index dbc4dc7..53e007a 100644 (file)
--- a/arch/arm/boot/dts/omap3-pandora-common.dtsi
+++ b/arch/arm/boot/dts/omap3-pandora-common.dtsi
@@ -18,7 +18,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
@@ -45,28 +45,28 @@
                pinctrl-names = "default";
                pinctrl-0 = <&led_pins>;
 
-               led@1 {
+               led1 {
                        label = "pandora::sd1";
                        gpios = <&gpio5 0 GPIO_ACTIVE_HIGH>;    /* GPIO_128 */
                        linux,default-trigger = "mmc0";
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "pandora::sd2";
                        gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;    /* GPIO_129 */
                        linux,default-trigger = "mmc1";
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "pandora::bluetooth";
                        gpios = <&gpio5 30 GPIO_ACTIVE_HIGH>;   /* GPIO_158 */
                        linux,default-trigger = "heartbeat";
                        default-state = "off";
                };
 
-               led@4 {
+               led4 {
                        label = "pandora::wifi";
                        gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>;   /* GPIO_159 */
                        linux,default-trigger = "mmc2";