ramips: mt7621: nix mac-address-increment

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

diff --git a/target/linux/ramips/dts/mt7621_sercomm_s1500.dtsi b/target/linux/ramips/dts/mt7621_sercomm_s1500.dtsi
index 6344f477e8e565e0be69524a3fa995a7286b6f0d..09862b8067a15f0aa1c3fe08db14cbf4c6a4bbe0 100644 (file)
--- a/target/linux/ramips/dts/mt7621_sercomm_s1500.dtsi
+++ b/target/linux/ramips/dts/mt7621_sercomm_s1500.dtsi
@@ -158,7 +158,7 @@
 };
 
 &gmac0 {
-       nvmem-cells = <&macaddr_factory_1000>;
+       nvmem-cells = <&macaddr_factory_1000 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -195,7 +195,9 @@
                                };
 
                                macaddr_factory_1000: macaddr@1000 {
+                                       compatible = "mac-base";
                                        reg = <0x1000 0x6>;
+                                       #nvmem-cell-cells = <1>;
                                };
                        };
                };
@@ -231,19 +233,7 @@
                reg = <0x0000 0 0 0 0>;
                ieee80211-freq-limit = <5000000 6000000>;
 
-               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_1000>;
-               nvmem-cell-names = "eeprom", "mac-address";
-               mac-address-increment = <2>;
-       };
-};
-
-&pcie1 {
-       wlan_2g: wifi@0,0 {
-               compatible = "mediatek,mt76";
-               reg = <0x0000 0 0 0 0>;
-               ieee80211-freq-limit = <2400000 2500000>;
-
-               nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_1000>;
+               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_1000 2>;
                nvmem-cell-names = "eeprom", "mac-address";
        };
 };
@@ -281,9 +271,8 @@
                        status = "okay";
                        label = "wan";
 
-                       nvmem-cells = <&macaddr_factory_1000>;
+                       nvmem-cells = <&macaddr_factory_1000 1>;
                        nvmem-cell-names = "mac-address";
-                       mac-address-increment = <1>;
                };
        };
 };