ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / rt5350_dlink_dwr-512-b.dts

diff --git a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts
index a7fc4765b76befbe634044f7564fe2c8e2a23c9e..56efcde9f5cd5accf2c92a4091151b9f00787bcd 100644 (file)
--- a/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts
+++ b/target/linux/ramips/dts/rt5350_dlink_dwr-512-b.dts
@@ -2,6 +2,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "dlink,dwr-512-b", "ralink,rt5350-soc";
@@ -39,7 +40,8 @@
                        gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
                };
                led_status: status {
-                       label = "green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
                2g {
@@ -102,9 +104,23 @@
                                reg = <0x10000 0x7e0000>;
                        };
 
-                       config: partition@7f0000 {
+                       partition@7f0000 {
                                label = "config";
                                reg = <0x7f0000 0x10000>;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_e07e: macaddr@e07e {
+                                               reg = <0xe07e 0x6>;
+                                       };
+
+                                       eeprom_config_e08a: eeprom@e08a {
+                                               reg = <0xe08a 0x200>;
+                                       };
+                               };
                        };
                };
        };
@@ -116,7 +132,7 @@
        spidev@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "siliconlabs,si3210";
+               compatible = "silabs,si3210";
 
                reg = <0>;
                spi-max-frequency = <1000000>;
@@ -140,18 +156,7 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&config 0xe08a>;
        ralink,led-polarity = <1>;
-       nvmem-cells = <&macaddr_config_e07e>;
-       nvmem-cell-names = "mac-address";
-};
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_e07e: macaddr@e07e {
-               reg = <0xe07e 0x6>;
-       };
+       nvmem-cells = <&eeprom_config_e08a>, <&macaddr_config_e07e>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };