ramips: use consistent naming scheme for LEDs

[openwrt/svn-archive/archive.git] / target / linux / ramips / dts / DIR-620-D1.dts

diff --git a/target/linux/ramips/dts/DIR-620-D1.dts b/target/linux/ramips/dts/DIR-620-D1.dts
index 8913e268f9f2fe65d0539a1a8a0b7f090cc0b17d..166d61ed0df00cc5e3f44fda6e8540571f7a07fd 100644 (file)
--- a/target/linux/ramips/dts/DIR-620-D1.dts
+++ b/target/linux/ramips/dts/DIR-620-D1.dts
@@ -7,19 +7,9 @@
        model = "D-Link DIR-620 D1";
 
        palmbus@10000000 {
-               sysc@0 {
-                       ralink,pinmux = "i2c", "spi", "uartlite", "mdio", "sdram", "rgmii";
-                       ralink,gpiomux = "jtag";
-                       ralink,uartmux = "gpio";
-                       ralink,wdtmux = <1>;
-               };
-
-               gpio0: gpio@600 {
-                       status = "okay";
-               };
-
                spi@b00 {
                        status = "okay";
+
                        m25p80@0 {
                                #address-cells = <1>;
                                #size-cells = <1>;
@@ -28,49 +18,73 @@
                                linux,modalias = "m25p80", "mx25l6405d";
                                spi-max-frequency = <10000000>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
+                               partition@0 {
+                                       label = "u-boot";
+                                       reg = <0x0 0x30000>;
+                                       read-only;
+                               };
+
+                               partition@30000 {
+                                       label = "u-boot-env";
+                                       reg = <0x30000 0x10000>;
+                                       read-only;
+                               };
+
+                               factory: partition@40000 {
+                                       label = "factory";
+                                       reg = <0x40000 0x10000>;
+                                       read-only;
+                               };
+
+                               partition@50000 {
+                                       label = "firmware";
+                                       reg = <0x50000 0x7b0000>;
+                               };
+                       };
                };
+       };
 
-               partition@30000 {
-                       label = "u-boot-env";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
+       pinctrl {
+               state_default: pinctrl0 {
+                       gpio {
+                               ralink,group = "i2c", "jtag", "uartf";
+                               ralink,function = "gpio";
+                       };
 
-               factory: partition@40000 {
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
+                       rgmii {
+                               ralink,group = "rgmii";
+                               ralink,function = "rgmii";
+                       };
 
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0x3b0000>;
-               };
+                       mdio {
+                               ralink,group = "mdio";
+                               ralink,function = "mdio";
                        };
                };
        };
 
        ethernet@10100000 {
-               status = "okay";
+               mtd-mac-address = <&factory 0x4>;
        };
 
        esw@10110000 {
-               status = "okay";
                ralink,portmap = <0x2f>;
        };
 
+       wmac@10180000 {
+               ralink,mtd-eeprom = <&factory 0>;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
+
                status {
-                       label = "d-link:green:status";
+                       label = "dir-620-d1:green:status";
                        gpios = <&gpio0 9 1>;
                };
+
                wifi {
-                       label = "d-link:green:wifi";
+                       label = "dir-620-d1:green:wifi";
                        gpios = <&gpio0 17 1>;
                };
        };
@@ -80,6 +94,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
                poll-interval = <20>;
+
                reset_wps {
                        label = "reset_wps";
                        gpios = <&gpio0 7 1>;
@@ -87,10 +102,6 @@
                };
        };
 
-       wmac@10180000 {
-               status = "okay";
-       };
-
        ehci@101c0000 {
                status = "okay";
        };