ramips: convert to new LED color/function format where possible

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

diff --git a/target/linux/ramips/dts/mt7628an_linksys_e5400.dts b/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
index 24fd31a7e203d62f72ae64dd88ebd3f99892328e..3eff008dda0e04bfe7391726a5d66f68cf89c75c 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
+++ b/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "linksys,e5400", "mediatek,mt7628an-soc";
@@ -46,7 +47,8 @@
                compatible = "gpio-leds";
 
                led_wps: wps {
-                       label = "green:wps";
+                       function = LED_FUNCTION_WPS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
        };
@@ -78,23 +80,28 @@
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x400>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x200>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_28: macaddr@28 {
-                                       reg = <0x28 0x6>;
+                                       macaddr_factory_28: macaddr@28 {
+                                               compatible = "mac-base";
+                                               reg = <0x28 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -123,7 +130,7 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cells = <&macaddr_factory_28 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -141,9 +148,8 @@
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
 
-               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28>;
+               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_28 3>;
                nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <3>;
        };
 };
 
@@ -161,8 +167,7 @@
 &wmac {
        status = "okay";
 
-       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28>;
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28 2>;
        nvmem-cell-names = "eeprom", "mac-address";
-       mac-address-increment = <2>;
 };