ramips: fix and clean up D-Link MAC address

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7621_zyxel_wap6805.dts

diff --git a/target/linux/ramips/dts/mt7621_zyxel_wap6805.dts b/target/linux/ramips/dts/mt7621_zyxel_wap6805.dts
index 1746014b9c6e010017e147553d5d1b8b39849d94..eabfcc2ef0636f46801930819ee362c6ea3c5b6c 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zyxel_wap6805.dts
+++ b/target/linux/ramips/dts/mt7621_zyxel_wap6805.dts
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        compatible = "zyxel,wap6805", "mediatek,mt7621-soc";
@@ -21,17 +22,19 @@
                compatible = "gpio-leds";
 
                led_status_red: status_red {
-                       label = "wap6805:red:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
                };
 
                status_blink {
-                       label = "wap6805:blink:status";
+                       label = "blink:status";
                        gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
                };
 
                led_status_green: status_green {
-                       label = "wap6805:green:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
        };
@@ -73,10 +76,24 @@
                        read-only;
                };
 
-               factory: partition@200000 {
+               partition@200000 {
                        label = "Factory";
                        reg = <0x200000 0x100000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
+                       };
                };
 
                partition@300000 {
@@ -123,12 +140,14 @@
 &pcie0 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0>;
+               nvmem-cells = <&eeprom_factory_0>;
+               nvmem-cell-names = "eeprom";
        };
 };
 
 &gmac0 {
-       mtd-mac-address = <&factory 0xe000>;
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
 };
 
 &gmac1 {