gemini: In-flight ethernet patches

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

diff --git a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
index 16d8edb341111e1b529694168317f7efd38de140..e4937c55c5e22eb3c6fe3b47611a6624edba2ace 100644 (file)
--- a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
+++ b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
@@ -62,24 +62,29 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
-                               compatible = "nvmem-cells";
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x4da8>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               eeprom_factory_8000: eeprom@8000 {
-                                       reg = <0x8000 0x4da8>;
-                               };
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x4da8>;
+                                       };
 
-                               macaddr_factory_e000: macaddr@e000 {
-                                       reg = <0xe000 0x6>;
+                                       eeprom_factory_8000: eeprom@8000 {
+                                               reg = <0x8000 0x4da8>;
+                                       };
+
+                                       macaddr_factory_e000: macaddr@e000 {
+                                               compatible = "mac-base";
+                                               reg = <0xe000 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 
@@ -117,7 +122,7 @@
 };
 
 &gmac0 {
-       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cells = <&macaddr_factory_e000 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -126,15 +131,12 @@
        label = "wan";
        phy-handle = <&ethphy4>;
 
-       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cells = <&macaddr_factory_e000 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
-&mdio {
-       ethphy4: ethernet-phy@4 {
-               reg = <4>;
-       };
+&ethphy4 {
+       /delete-property/ interrupts;
 };
 
 &switch0 {