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

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

diff --git a/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts b/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
index b852c11e06f3210173f4857001d530a7cee1c8d0..0f5525378017f334b19dc4e3f38f137bfd338cef 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
+++ b/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Motorola MWR03";
@@ -30,12 +31,14 @@
                compatible = "gpio-leds";
 
                led_status_orange: status_orange {
-                       label = "orange:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                };
 
                led_status_white: status_white {
-                       label = "white:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
                };
        };
@@ -68,19 +71,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_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               compatible = "mac-base";
+                                               reg = <0x4 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -113,9 +125,8 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cells = <&macaddr_factory_4 (-1)>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <(-1)>;
 };
 
 &esw {
@@ -130,7 +141,8 @@
 &pcie0 {
        wifi@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
+               nvmem-cells = <&eeprom_factory_8000>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };