ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / rt3052_planex_mzk-w300nh2.dts

diff --git a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts
index 779443e70e2c90b480e429d31cbea414bacb6c83..88e2480f41d93c27c58da6a54e8e45b51432dfa4 100644 (file)
--- a/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts
+++ b/target/linux/ramips/dts/rt3052_planex_mzk-w300nh2.dts
@@ -2,6 +2,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "planex,mzk-w300nh2", "ralink,rt3052-soc";
@@ -37,10 +38,24 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
+                               };
                        };
 
                        partition@3e0000 {
@@ -61,17 +76,20 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "green:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "amber:wlan";
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                };
 
                wps {
-                       label = "amber:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_AMBER>;
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
        };
@@ -117,15 +135,6 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };