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

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7628an_comfast_cf-wr617ac.dts

diff --git a/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts b/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
index bec9e9518258c210f72ec857700bf6dc79ed5628..2a304e9c630bf356ead56ff569cd68446338c04f 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
+++ b/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
@@ -4,6 +4,7 @@
 #include "mt7628an.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "comfast,cf-wr617ac", "mediatek,mt7628an-soc";
@@ -21,11 +22,13 @@
        leds {
                compatible = "gpio-leds";
                led_status_blue: status_blue {
-                       label = "blue:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
                };
                led_status_red: status_red {
-                       label = "red:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
                };
        };
@@ -70,19 +73,32 @@
                        };
 
                        factory: partition@40000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_factory_8004: macaddr@8004 {
-                                       reg = <0x8004 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_8004: macaddr@8004 {
+                                               compatible = "mac-base";
+                                               reg = <0x8004 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               reg = <0xe000 0x6>;
+                                       };
                                };
                        };
 
@@ -103,11 +119,9 @@
        wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&macaddr_factory_8004>;
-               nvmem-cell-names = "mac-address";
-               mac-address-increment = <2>;
+               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_8004 2>;
+               nvmem-cell-names = "eeprom", "mac-address";
        };
 };
 
@@ -122,5 +136,6 @@
 
 &wmac {
        status = "okay";
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };