mediatek: convert to nvmem-layout

Will allow removing mac-address-increment.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts b/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts
index a9f29591912c543c3d3c4c317d241829034a2403..b8fac373a0a843b58b71139b8e2341071136a0db 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts
+++ b/target/linux/mediatek/dts/mt7622-buffalo-wsr-2533dhp2.dts
@@ -87,7 +87,6 @@
                        };
 
                        factory: partition@1c0000 {
-                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x1c0000 0x40000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-m32-a1.dts b/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-m32-a1.dts
index ca680e4c29f66c827f2c717b3b7efc47627e44de..9c90cee516a6a82339c64461389ba2935c892d4a 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-m32-a1.dts
+++ b/target/linux/mediatek/dts/mt7622-dlink-eagle-pro-ai-m32-a1.dts
@@ -300,22 +300,24 @@
                        };
 
                        odm: partition@180000 {
-                               compatible = "nvmem-cells";
                                label = "Odm";
                                reg = <0x00180000 0x00040000>;
                                read-only;
 
-                               macaddr_odm_83: macaddr@83 {
-                                       reg = <0x83 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_odm_83: macaddr@83 {
+                                               reg = <0x83 0x6>;
+                                       };
                                };
                        };
 
                        config1: partition@1C0000 {
-                               compatible = "nvmem-cells";
                                label = "Config1";
                                reg = <0x001C0000 0x00080000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
                        };
 

diff --git a/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts b/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
index c7e11c80b05990bc6f87d510522137a787f964d7..503e12c91be860d272ef0fc01aef547a66e3453e 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
+++ b/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
@@ -326,20 +326,22 @@
                                reg = <0x1c0000 0x100000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
-                               };
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
 
-                               macaddr_factory_7fff4: macaddr@7fff4 {
-                                       reg = <0x7fff4 0x6>;
-                               };
+                                       macaddr_factory_7fff4: macaddr@7fff4 {
+                                               reg = <0x7fff4 0x6>;
+                                       };
 
-                               macaddr_factory_7fffa: macaddr@7fffa {
-                                       reg = <0x7fffa 0x6>;
+                                       macaddr_factory_7fffa: macaddr@7fffa {
+                                               reg = <0x7fffa 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts b/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts
index 9df736eb01e9a996205512fcbe4fa8f927e4fcfb..e78db1de6cf41e606d991ba4f92afc3e0c61783f 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts
+++ b/target/linux/mediatek/dts/mt7622-linksys-e8450-ubi.dts
@@ -34,6 +34,20 @@
                        label = "factory";
                        reg = <0x1c0000 0x100000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_factory_7fff4: macaddr@7fff4 {
+                                       reg = <0x7fff4 0x6>;
+                               };
+
+                               macaddr_factory_7fffa: macaddr@7fffa {
+                                       reg = <0x7fffa 0x6>;
+                               };
+                       };
                };
 
                partition@300000 {
@@ -61,17 +75,3 @@
        nvmem-cells = <&macaddr_factory_7fffa>;
        nvmem-cell-names = "mac-address";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_7fff4: macaddr@7fff4 {
-               reg = <0x7fff4 0x6>;
-       };
-
-       macaddr_factory_7fffa: macaddr@7fffa {
-               reg = <0x7fffa 0x6>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7622-linksys-e8450.dts b/target/linux/mediatek/dts/mt7622-linksys-e8450.dts
index 8552dbf1a92b117a4934b4e3761ebea1a8eb1d69..dedcc057f49de550e4ab7b0c01dc4b7c76940e9b 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-linksys-e8450.dts
+++ b/target/linux/mediatek/dts/mt7622-linksys-e8450.dts
@@ -45,6 +45,20 @@
                factory: partition@1c0000 {
                        label = "factory";
                        reg = <0x1c0000 0x0100000>;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               macaddr_factory_7fff4: macaddr@7fff4 {
+                                       reg = <0x7fff4 0x6>;
+                               };
+
+                               macaddr_factory_7fffa: macaddr@7fffa {
+                                       reg = <0x7fffa 0x6>;
+                               };
+                       };
                };
 
                partition@300000 {
@@ -106,17 +120,3 @@
        nvmem-cells = <&macaddr_factory_7fffa>;
        nvmem-cell-names = "mac-address";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_7fff4: macaddr@7fff4 {
-               reg = <0x7fff4 0x6>;
-       };
-
-       macaddr_factory_7fffa: macaddr@7fffa {
-               reg = <0x7fffa 0x6>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7622-netgear-wax206.dts b/target/linux/mediatek/dts/mt7622-netgear-wax206.dts
index 9e877b85f16d44d19140d804ce278d608d2eb489..737ac35f3d548c8a73d017c8b882002c5d276878 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-netgear-wax206.dts
+++ b/target/linux/mediatek/dts/mt7622-netgear-wax206.dts
@@ -405,19 +405,22 @@
                        };
 
                        factory: partition@1c0000 {
-                               compatible = "nvmem-cells";
                                label = "Factory";
                                reg = <0x1c0000 0x0100000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                                read-only;
 
-                               macaddr_factory_7fff4: macaddr@7fff4 {
-                                       reg = <0x7fff4 0x6>;
-                               };
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_factory_7fffa: macaddr@7fffa {
-                                       reg = <0x7fffa 0x6>;
+                                       macaddr_factory_7fff4: macaddr@7fff4 {
+                                               reg = <0x7fff4 0x6>;
+                                       };
+
+                                       macaddr_factory_7fffa: macaddr@7fffa {
+                                               reg = <0x7fffa 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/mediatek/dts/mt7622-totolink-a8000ru.dts b/target/linux/mediatek/dts/mt7622-totolink-a8000ru.dts
index b634e28783a0b2dd3acf7d326baad9652e618e66..776d38d1e31dcbd3965ea76f4497b5f23333e3bd 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-totolink-a8000ru.dts
+++ b/target/linux/mediatek/dts/mt7622-totolink-a8000ru.dts
@@ -284,6 +284,20 @@
                                label = "factory";
                                reg = <0x1c0000 0x40000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_24: macaddr@24 {
+                                               reg = <0x24 0x6>;
+                                       };
+
+                                       macaddr_factory_2a: macaddr@2a {
+                                               reg = <0x2a 0x6>;
+                                       };
+                               };
                        };
 
                        partition@200000 {
@@ -305,20 +319,6 @@
        };
 };
 
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_24: macaddr@24 {
-               reg = <0x24 0x6>;
-       };
-
-       macaddr_factory_2a: macaddr@2a {
-               reg = <0x2a 0x6>;
-       };
-};
-
 &ssusb {
        vusb33-supply = <&reg_3p3v>;
        vbus-supply = <&reg_5v>;

diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts
index 5b1fd1d9ba82da20f35b82820a4b5a72da13c067..7a7a8a815911ea1c093f5aab5d036203a4a11c16 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1-ubootmod.dts
@@ -33,6 +33,20 @@
                label = "eeprom";
                reg = <0x110000 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 {
+                               reg = <0x6 0x6>;
+                       };
+               };
        };
 
        partition@120000 {
@@ -68,17 +82,3 @@
        nvmem-cells = <&macaddr_eeprom_0>;
        nvmem-cell-names = "mac-address";
 };
-
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_eeprom_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts
index 95f19af4cd9b69d41fe5705c14454e43273bef82..7e07e1ba6b5982c36217db55f7f50cfbea777339 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts
+++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts
@@ -38,6 +38,20 @@
                label = "eeprom";
                reg = <0x110000 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 {
+                               reg = <0x6 0x6>;
+                       };
+               };
        };
 
        partition@120000 {
@@ -84,17 +98,3 @@
        nvmem-cells = <&macaddr_eeprom_0>;
        nvmem-cell-names = "mac-address";
 };
-
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_eeprom_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v2-ubootmod.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v2-ubootmod.dts
index 6a7b6868ce37872327cb584e6f991a8b96f6ad88..3a37d1d5004f0f4eac38f0835738b2e25f71353a 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v2-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v2-ubootmod.dts
@@ -33,6 +33,20 @@
                label = "eeprom";
                reg = <0x110000 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 {
+                               reg = <0x6 0x6>;
+                       };
+               };
        };
 
        partition@120000 {
@@ -68,17 +82,3 @@
        nvmem-cells = <&macaddr_eeprom_0>;
        nvmem-cell-names = "mac-address";
 };
-
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_eeprom_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v2.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v2.dts
index f40e8e632b05d313b84c949ba3d03dc12c64ce7d..9fef3d67210b28c8e7af931e39081f97fe0712b0 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v2.dts
+++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v2.dts
@@ -38,6 +38,20 @@
                label = "eeprom";
                reg = <0x110000 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 {
+                               reg = <0x6 0x6>;
+                       };
+               };
        };
 
        partition@120000 {
@@ -84,17 +98,3 @@
        nvmem-cells = <&macaddr_eeprom_0>;
        nvmem-cell-names = "mac-address";
 };
-
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_eeprom_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v3-ubootmod.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v3-ubootmod.dts
index 46faf8da30744289ab9ec410db359c32e7c3b9ac..e91aaa63f58bdf6fc212c8f398fd2b416c514933 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v3-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v3-ubootmod.dts
@@ -33,6 +33,20 @@
                label = "eeprom";
                reg = <0x110000 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 {
+                               reg = <0x6 0x6>;
+                       };
+               };
        };
 
        partition@120000 {
@@ -68,17 +82,3 @@
        nvmem-cells = <&macaddr_eeprom_0>;
        nvmem-cell-names = "mac-address";
 };
-
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_eeprom_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v3.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v3.dts
index 34bdaa6254af554169397c6db9e900ff5d35b27f..71ee9f0ceca00753a9db64399744ff419b0cda18 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v3.dts
+++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v3.dts
@@ -38,6 +38,20 @@
                label = "eeprom";
                reg = <0x110000 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 {
+                               reg = <0x6 0x6>;
+                       };
+               };
        };
 
        partition@120000 {
@@ -84,17 +98,3 @@
        nvmem-cells = <&macaddr_eeprom_0>;
        nvmem-cell-names = "mac-address";
 };
-
-&eeprom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_eeprom_0: macaddr@0 {
-               reg = <0x0 0x6>;
-       };
-
-       macaddr_eeprom_6: macaddr@6 {
-               reg = <0x6 0x6>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts b/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
index ecc25fd328ca04922541c0b6b1276777e061a7c8..df571a5375139bf4fdbae3b72a00eae4a8bbd3ed 100644 (file)
--- a/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
+++ b/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
@@ -268,12 +268,14 @@
                                reg = <0x1c0000 0x80000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/mediatek/dts/mt7629-iptime-a6004mx.dts b/target/linux/mediatek/dts/mt7629-iptime-a6004mx.dts
index dc1868a0669e0da37e3c0250f5962473c72c9491..20aeac6e14185e62ac822ffb0bcfae417322adae 100644 (file)
--- a/target/linux/mediatek/dts/mt7629-iptime-a6004mx.dts
+++ b/target/linux/mediatek/dts/mt7629-iptime-a6004mx.dts
@@ -212,12 +212,14 @@
                                reg = <0x140000 0x80000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/mediatek/dts/mt7629-tplink_eap225-v5.dts b/target/linux/mediatek/dts/mt7629-tplink_eap225-v5.dts
index 52e22541faf3419eab0546f3eec35dff560d52bf..5eab714fdac3c104c1f0bff1137d73125cfc3f4a 100644 (file)
--- a/target/linux/mediatek/dts/mt7629-tplink_eap225-v5.dts
+++ b/target/linux/mediatek/dts/mt7629-tplink_eap225-v5.dts
@@ -102,11 +102,16 @@
                        partition@90000 {
                                label = "Factory";
                                reg = <0x00090000 0x00010000>;
-                               compatible = "nvmem-cells";
                                read-only;
 
-                               macaddr_factory_8: macaddr@8 {
-                                       reg = <0x8 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_8: macaddr@8 {
+                                               reg = <0x8 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/mediatek/dts/mt7981a-ubnt-unifi-6-plus.dts b/target/linux/mediatek/dts/mt7981a-ubnt-unifi-6-plus.dts
index ece78ee50ebc56664c19d65f325eb7f68206d6ef..48fe2f2fc0e537a117b0d494fd7d967cb6bd0db7 100644 (file)
--- a/target/linux/mediatek/dts/mt7981a-ubnt-unifi-6-plus.dts
+++ b/target/linux/mediatek/dts/mt7981a-ubnt-unifi-6-plus.dts
@@ -115,16 +115,18 @@
                                reg = <0x00000 0x10000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_eeprom_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
-                               };
-
-                               macaddr_eeprom_6: macaddr@6 {
-                                       reg = <0x6 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_eeprom_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
+
+                                       macaddr_eeprom_6: macaddr@6 {
+                                               reg = <0x6 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
index aea6f02da24a7f54cf76bbdb59d1856739d5dcfb..4949cdb3d77da76bf6b6770b0ee94f97c20b821a 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
+++ b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
@@ -128,12 +128,14 @@
                                reg = <0x0180000 0x0100000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_art_0: macaddr@0 {
-                                       reg = <0x0 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_art_0: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso
index ff94a550fd624f26ac6f85f33a0a31258393e73e..4d2b01cb63e90ea14d0643e2212c7da587fcef30 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso
+++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dtso
@@ -84,7 +84,6 @@
                                                reg = <0x180000 0x200000>;
                                                read-only;
 
-                                               compatible = "nvmem-cells";
                                                nvmem-layout {
                                                        compatible = "fixed-layout";
                                                        #address-cells = <1>;

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
index 56e90b172289c2f9e24e4543758ec8fc926243ca..366d35ecf8590817e843bf3ef90bee636348e801 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
@@ -168,6 +168,16 @@
                                label = "bdinfo";
                                reg = <0x60000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_bdinfo_de00: macaddr@de00 {
+                                               reg = <0xde00 0x6>;
+                                       };
+                               };
                        };
 
                        partition@70000 {
@@ -270,13 +280,3 @@
        status = "okay";
        mediatek,mtd-eeprom = <&factory 0x0>;
 };
-
-&bdinfo {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_bdinfo_de00: macaddr@de00 {
-               reg = <0xde00 0x6>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
index f9b8c16652e5ad8b6da9af5cab957a8bf43856f0..135eb0410dd10dbb0596d4591ac45188a9fe67a5 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
+++ b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
@@ -179,12 +179,14 @@
                                reg = <0x180000 0x0200000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr: macaddr@a {
-                                       reg = <0xa 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr: macaddr@a {
+                                               reg = <0xa 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
index d85c6e46510b2fd40c5ae2600db223bdbf6c092f..bb6b474080ac12b2b7954b65807e577fa3ccb425 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
@@ -118,6 +118,20 @@
                                label = "Factory";
                                reg = <0x0180000 0x0200000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_wan: macaddr@a0024 {
+                                               reg = <0xa0024 0x6>;
+                                       };
+
+                                       macaddr_lan: macaddr@a002a {
+                                               reg = <0xa002a 0x6>;
+                                       };
+                               };
                        };
 
                        partition@380000 {
@@ -209,17 +223,3 @@
 
        mediatek,mtd-eeprom = <&factory 0x0>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_wan: macaddr@a0024 {
-               reg = <0xa0024 0x6>;
-       };
-
-       macaddr_lan: macaddr@a002a {
-               reg = <0xa002a 0x6>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi
index d09ae2a3e781110a989568e0ffecfbdd3aad3645..82f3d350143e66a89ef1bb877f4e75631f0b8f86 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-wr30u.dtsi
@@ -177,12 +177,14 @@
                                reg = <0x180000 0x200000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
index d222cebb4fe83c628d45cb3ec0a87f9ecac9a783..54df8c054ace3a6b477074a7a38d70c7804bbc43 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
@@ -136,12 +136,14 @@
                                reg = <0x180000 0x0200000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr: macaddr@a {
-                                       reg = <0xa 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr: macaddr@a {
+                                               reg = <0xa 0x6>;
+                                       };
                                };
                        };
 
@@ -190,12 +192,14 @@
                                reg = <0xef80000 0x80000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
 
-                               macaddr_mrd_1fff8: macaddr@1fff8 {
-                                       reg = <0x1fff8 0x6>;
+                                       macaddr_mrd_1fff8: macaddr@1fff8 {
+                                               reg = <0x1fff8 0x6>;
+                                       };
                                };
                        };
                };

diff --git a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
index ddf332a0dcc0086268ec6f83c507a2eae2971236..c339d0e6f35a5d6da821f774aaa05cce38e22aa3 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
@@ -182,6 +182,16 @@
                                label = "config";
                                reg = <0x100000 0x0060000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_config_1c: macaddr@1c {
+                                               reg = <0x1c 0x6>;
+                                       };
+                               };
                        };
 
                        factory: partition@160000 {
@@ -258,13 +268,3 @@
        mac-address-increment = <2>;
        status = "okay";
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_1c: macaddr@1c {
-               reg = <0x1c 0x6>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
index b2711eb7d7ddab3e0c05db1c0633f16338f25a08..5974802df02a8ff8e145decb8c2f176bb288be88 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
@@ -167,12 +167,14 @@
                                reg = <0x180000 0x200000>;
                                read-only;
 
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               macaddr_factory_4: macaddr@4 {
-                                       reg = <0x4 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
index 987510d4869308944fcfa083bed0a2a67f2bf542..4dbbd1367794e0908c42539e84c5f2a4005de540 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
@@ -43,6 +43,35 @@
                label = "Factory";
                reg = <0x180000 0x0200000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       eeprom_factory: eeprom@0 {
+                               #size-cells = <1>;
+                               reg = <0x0 0x1000>;
+                       };
+
+                       macaddr_factory_0004: macaddr@0004 {
+                               compatible = "mac-base";
+                               reg = <0x0004 0x6>;
+                               #nvmem-cell-cells = <1>;
+                       };
+
+                       macaddr_factory_0024: macaddr@0024 {
+                               compatible = "mac-base";
+                               reg = <0x0024 0x6>;
+                               #nvmem-cell-cells = <1>;
+                       };
+
+                       macaddr_factory_002a: macaddr@002a {
+                               compatible = "mac-base";
+                               reg = <0x002a 0x6>;
+                               #nvmem-cell-cells = <1>;
+                       };
+               };
        };
 
        partition@380000 {
@@ -74,40 +103,6 @@
        };
 };
 
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-
-               eeprom_factory: eeprom@0 {
-                       #size-cells = <1>;
-                       reg = <0x0 0x1000>;
-               };
-
-               macaddr_factory_0004: macaddr@0004 {
-                       compatible = "mac-base";
-                       reg = <0x0004 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
-
-               macaddr_factory_0024: macaddr@0024 {
-                       compatible = "mac-base";
-                       reg = <0x0024 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
-
-               macaddr_factory_002a: macaddr@002a {
-                       compatible = "mac-base";
-                       reg = <0x002a 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
-       };
-};
-
 &gmac0 {
        nvmem-cells = <&macaddr_factory_002a 0>;
        nvmem-cell-names = "mac-address";

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts
index a300e2052d97a620eab3da6f2b2b45cc0fda1934..62ce50ed232f15b4de428d07cf39b5e13bf8fc05 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts
@@ -36,6 +36,35 @@
                label = "Factory";
                reg = <0x180000 0x0200000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>; 
+                       #size-cells = <1>;
+
+                       eeprom_factory: eeprom@0 {
+                               #size-cells = <1>;
+                               reg = <0x0 0x1000>;
+                       };
+
+                       macaddr_factory_0004: macaddr@0004 {
+                               compatible = "mac-base";
+                               reg = <0x0004 0x6>;
+                               #nvmem-cell-cells = <1>;
+                       };
+
+                       macaddr_factory_0024: macaddr@0024 {
+                               compatible = "mac-base";
+                               reg = <0x0024 0x6>;
+                               #nvmem-cell-cells = <1>;
+                       };
+
+                       macaddr_factory_002a: macaddr@002a {
+                               compatible = "mac-base";
+                               reg = <0x002a 0x6>;
+                               #nvmem-cell-cells = <1>;
+                       };
+               };
        };
 
        partition@380000 {
@@ -56,40 +85,6 @@
        };
 };
 
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>; 
-
-               eeprom_factory: eeprom@0 {
-                       #size-cells = <1>;
-                       reg = <0x0 0x1000>;
-               };
-
-               macaddr_factory_0004: macaddr@0004 {
-                       compatible = "mac-base";
-                       reg = <0x0004 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
-
-               macaddr_factory_0024: macaddr@0024 {
-                       compatible = "mac-base";
-                       reg = <0x0024 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
-
-               macaddr_factory_002a: macaddr@002a {
-                       compatible = "mac-base";
-                       reg = <0x002a 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
-       };
-};
-
 &gmac0 {
        nvmem-cells = <&macaddr_factory_002a 0>;
        nvmem-cell-names = "mac-address";

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
index a486f29fec8fe339fddc48feca883756acd2ca3e..f5bb73c97d7ee79c141b253115c34dc9914b144a 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
@@ -337,10 +337,6 @@
                                label = "Factory";
                                reg = <0x180000 0x200000>;
                                read-only;
-
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
                        };
                        partition@380000 {
                                label = "FIP";