ramips: mt7621: nix mac-address-increment

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_ubnt_unifi-6-lite.dts

diff --git a/target/linux/ramips/dts/mt7621_ubnt_unifi-6-lite.dts b/target/linux/ramips/dts/mt7621_ubnt_unifi-6-lite.dts
index f5425ccfee5c7a4628c75d923fc8d8de0d43b439..cd19893e1451dff952b153bb1b5816b7e5e726ce 100644 (file)
--- a/target/linux/ramips/dts/mt7621_ubnt_unifi-6-lite.dts
+++ b/target/linux/ramips/dts/mt7621_ubnt_unifi-6-lite.dts
@@ -15,7 +15,7 @@
        status = "okay";
 
        flash@0 {
-               compatible = "mx25l25635f", "jedec,spi-nor";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <50000000>;
 
@@ -40,12 +40,38 @@
                                label = "factory";
                                reg = <0x70000 0x40000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x400>;
+                                       };
+                               };
                        };
 
                        eeprom: partition@b0000 {
                                label = "eeprom";
                                reg = <0xb0000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_eeprom_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_eeprom_6: macaddr@6 {
+                                               compatible = "mac-base";
+                                               reg = <0x6 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@c0000 {
@@ -73,12 +99,37 @@
        };
 };
 
+&gmac0 {
+       nvmem-cells = <&macaddr_eeprom_0>;
+       nvmem-cell-names = "mac-address";
+};
+
 &wlan_2g {
-       mtd-mac-address = <&eeprom 0x0>;
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_eeprom_0>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &wlan_5g {
+       compatible = "mediatek,mt76";
+
        mediatek,mtd-eeprom = <&factory 0x20000>;
-       mtd-mac-address = <&eeprom 0x6>;
+
+       /* This is a workaround.
+        *
+        * Ubiquiti uses a +2 offset in the first octet relative
+        * to the 2.4 GHz WMAC. Other octets are identical.
+        *
+        * The vendor firmware increases the last octet by 2 for each
+        * VAP.
+        *
+        * This is in conflict on how mac80211 addresses subsequent VAPs.
+        * mac80211 increases the first octet by two for each VAP, leading
+        * to conflicting MAC addresses for subsequent interfaces.
+        */
+       nvmem-cells = <&macaddr_eeprom_6 1>;
+       nvmem-cell-names = "mac-address";
+
        ieee80211-freq-limit = <5000000 6000000>;
+
+       mediatek,disable-radar-background;
 };