ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / rt2880_airlink101_ar670w.dts

diff --git a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts
index 23e4db3aec86e6c557db4849b3bca7177f8e6ab5..7ff3b370b55c93f046e3281c096df781852033b7 100644 (file)
--- a/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts
+++ b/target/linux/ramips/dts/rt2880_airlink101_ar670w.dts
@@ -2,6 +2,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "airlink101,ar670w", "ralink,rt2880-soc";
@@ -30,20 +31,23 @@
                                read-only;
                        };
 
-                       factory: partition@30000 {
-                               compatible = "nvmem-cells";
-                               label = "factory";
+                       partition@30000 {
                                reg = <0x30000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               label = "factory";
                                read-only;
 
-                               eeprom_factory_2000: eeprom@2000 {
-                                       reg = <0x2000 0x200>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_factory_2004: macaddr@2004 {
-                                       reg = <0x2004 0x6>;
+                                       eeprom_factory_2000: eeprom@2000 {
+                                               reg = <0x2000 0x200>;
+                                       };
+
+                                       macaddr_factory_2004: macaddr@2004 {
+                                               reg = <0x2004 0x6>;
+                                       };
                                };
                        };
 
@@ -59,12 +63,14 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
                };
 
                wpsblue {
-                       label = "blue:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
        };
@@ -115,7 +121,6 @@
 };
 
 &wmac {
-       status = "okay";
        nvmem-cells = <&eeprom_factory_2000>;
        nvmem-cell-names = "eeprom";
 };