ramips: mt7621: nix mac-address-increment

[openwrt/staging/hauke.git] / target / linux / ramips / dts / mt7621_mqmaker_witi.dts

diff --git a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
index cb6310df18d162638a4c6080b04b7d00c404a21c..0052040f36932132cb430e65c0a2fef4f3063622 100644 (file)
--- a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
+++ b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
@@ -60,6 +60,26 @@
                        factory: partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x200>;
+                                       };
+
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x200>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               compatible = "mac-base";
+                                               reg = <0xe000 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -78,28 +98,42 @@
 &pcie0 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
                ieee80211-freq-limit = <5000000 6000000>;
-               nvmem-cells = <&macaddr_factory_e000>;
-               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&eeprom_factory_8000>, <&macaddr_factory_e000 0>;
+               nvmem-cell-names = "eeprom", "mac-address";
        };
 };
 
 &pcie1 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0000>;
                ieee80211-freq-limit = <2400000 2500000>;
-               nvmem-cells = <&macaddr_factory_e000>;
-               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_e000 0>;
+               nvmem-cell-names = "eeprom", "mac-address";
        };
 };
 
 &gmac0 {
-       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cells = <&macaddr_factory_e000 0>;
        nvmem-cell-names = "mac-address";
 };
 
+&gmac1 {
+       status = "okay";
+       label = "wan2";
+       phy-mode = "rgmii-rxid";
+       phy-handle = <&ethphy5>;
+
+       nvmem-cells = <&macaddr_factory_e000 1>;
+       nvmem-cell-names = "mac-address";
+};
+
+&mdio {
+       ethphy5: ethernet-phy@5 {
+               reg = <5>;
+       };
+};
+
 &switch0 {
        ports {
                port@0 {
@@ -124,10 +158,10 @@
 
                port@4 {
                        status = "okay";
-                       label = "wan";
-                       nvmem-cells = <&macaddr_factory_e000>;
+                       label = "wan1";
+
+                       nvmem-cells = <&macaddr_factory_e000 1>;
                        nvmem-cell-names = "mac-address";
-                       mac-address-increment = <1>;
                };
        };
 };
@@ -138,13 +172,3 @@
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-};