mediatek: filogic: replace mtd-eeprom with nvmem

These use fairly standard sizes.

0x1000 for mt7916 and 0x1e00 for mt7992.

Added a mediatek,mt76 compatible line where missing as required by mt76
upstream Documentation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23113
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts b/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
index 9da397114397b08eb5af24f639ca17ab13356d5e..548e60c0dda96d2325c110fabba5594eb5e37c92 100644 (file)
--- a/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
+++ b/target/linux/mediatek/dts/mt7981a-comfast-cf-e393ax.dts
@@ -167,7 +167,7 @@
                                read-only;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981a-teltonika-rutc50.dts b/target/linux/mediatek/dts/mt7981a-teltonika-rutc50.dts
index 8297fdc69c6f2127b2969125cc07535dbf7888a3..9172ac37f5b277b2aa2bf10675b649bb567071b1 100644 (file)
--- a/target/linux/mediatek/dts/mt7981a-teltonika-rutc50.dts
+++ b/target/linux/mediatek/dts/mt7981a-teltonika-rutc50.dts
@@ -382,7 +382,7 @@
                                reg = <0x40000 0x0010000>;
                        };
 
-                       factory: partition@50000 {
+                       partition@50000 {
                                label = "factory";
                                reg = <0x50000 0x00A0000>;
                                read-only;
@@ -398,11 +398,7 @@
                                };
                        };
 
-                       config: partition@f0000 {
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
+                       partition@f0000 {
                                label = "config";
                                reg = <0xF0000 0x0010000>;
                                read-only;

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 2f21f8939fb8af2eb4ddc9c7a389e007d15a9226..e4c7c3cc95c467ca6d257e51d3b45cfef15ea88e 100644 (file)
--- a/target/linux/mediatek/dts/mt7981a-ubnt-unifi-6-plus.dts
+++ b/target/linux/mediatek/dts/mt7981a-ubnt-unifi-6-plus.dts
@@ -111,7 +111,7 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       eeprom: partition@0 {
+                       partition@0 {
                                label = "EEPROM";
                                reg = <0x00000 0x10000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-bazis-ax3000wm.dts b/target/linux/mediatek/dts/mt7981b-bazis-ax3000wm.dts
index 5d9978a3ebf7bff0300c74ea828d2bf070adaf5d..7c08e7540493f38e5a05935d24066a1c1a837224 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-bazis-ax3000wm.dts
+++ b/target/linux/mediatek/dts/mt7981b-bazis-ax3000wm.dts
@@ -190,7 +190,7 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
index 7e115bec9320f9eb23f6a7fb9c1b36132d4e7d2a..73eeacf223ad577fd3bf0fa38eede786409e9ec5 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
+++ b/target/linux/mediatek/dts/mt7981b-cetron-ct3003.dts
@@ -144,10 +144,20 @@
                                };
                        };
 
-                       factory: partition@280000 {
+                       partition@280000 {
                                label = "Factory";
                                reg = <0x0280000 0x0100000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+                               };
                        };
 
                        partition@380000 {
@@ -247,5 +257,6 @@
 &wifi {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-comfast-cf-wr632ax-common.dtsi b/target/linux/mediatek/dts/mt7981b-comfast-cf-wr632ax-common.dtsi
index 43fb5c5a4cee0de08f2efd953f7f5b4daa77eb85..b418c15e7eb9b6983bef1b890a4b963d08fa907f 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-comfast-cf-wr632ax-common.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-comfast-cf-wr632ax-common.dtsi
@@ -166,7 +166,7 @@
                                read-only;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-confiabits-mt7981.dts b/target/linux/mediatek/dts/mt7981b-confiabits-mt7981.dts
index 167b49117ba4260cee153b97e335560407129554..fec183da6c333bb880321f75f7f9cf916a482609 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-confiabits-mt7981.dts
+++ b/target/linux/mediatek/dts/mt7981b-confiabits-mt7981.dts
@@ -231,7 +231,7 @@
                                read-only;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts
index 0dd195a0eae0399cc138efa31907bc47f6e74eb3..6dfb8aea5eaecef0054051bb7b22e8bd924be207 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-ap3000outdoor-v1.dts
@@ -141,7 +141,7 @@
                                read-only;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;
@@ -201,6 +201,7 @@
 
 &wifi {
        status = "okay";
+
        nvmem-cells = <&eeprom_factory_0>;
        nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-ap3000wall-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-ap3000wall-v1.dts
index adcbfdd9c56fdf015bbefccab189753bd0f75b33..23fa59e0e7fb7fe881d9423dd645ea2408d68139 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-ap3000wall-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-ap3000wall-v1.dts
@@ -156,7 +156,7 @@
                                read-only;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;
@@ -271,6 +271,7 @@
 
 &wifi {
        status = "okay";
+
        nvmem-cells = <&eeprom_factory_0>;
        nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-m3000.dtsi b/target/linux/mediatek/dts/mt7981b-cudy-m3000.dtsi
index c6fa571e8646319fa4cc9a044b01fe356fbd2019..1d293c4ff76eedec5a0763bb9fadb42869902c82 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-m3000.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-cudy-m3000.dtsi
@@ -130,10 +130,20 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x0180000 0x0200000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+                               };
                        };
 
                        bdinfo: partition@380000 {
@@ -191,5 +201,7 @@
 
 &wifi {
        status = "okay";
-       mediatek,mtd-eeprom = <&factory 0x0>;
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts
index d3e1e86b62c5741be5dd552230ccb14fde017b25..826e86618aa1fc7220db43018f27f05d371dfdd3 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-re3000-v1.dts
@@ -142,7 +142,7 @@
                                read-only;
                        };
 
-                       factory: partition@50000 {
+                       partition@50000 {
                                label = "Factory";
                                reg = <0x50000 0x10000>;
                                read-only;
@@ -214,6 +214,7 @@
 
 &wifi {
        status = "okay";
+
        nvmem-cells = <&eeprom_factory_0>;
        nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-tr3000-v1.dtsi b/target/linux/mediatek/dts/mt7981b-cudy-tr3000-v1.dtsi
index 4f75b3359bc92cfba0362793deeed7250cd7998f..c43f3328a3b5e11e7288c549725301656e2d4384 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-tr3000-v1.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-cudy-tr3000-v1.dtsi
@@ -137,7 +137,7 @@
                                read-only;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;
@@ -205,6 +205,7 @@
 
 &wifi {
        status = "okay";
+
        nvmem-cells = <&eeprom_factory_0>;
        nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
index 72491d0d2eacfc7d82115590fea777a8eb077512..188615a561816b09c3ed6f0b5207d983d31482fe 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-cudy-wr3000-v1.dts
@@ -160,10 +160,20 @@
                                read-only;
                        };
 
-                       factory: partition@50000 {
+                       partition@50000 {
                                label = "Factory";
                                reg = <0x50000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+                               };
                        };
 
                        bdinfo: partition@60000 {
@@ -272,5 +282,7 @@
 
 &wifi {
        status = "okay";
-       mediatek,mtd-eeprom = <&factory 0x0>;
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp.dts b/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp.dts
index d43718774b28513008f9cd2d8ae78813d323700b..3689aacdc2737407e9644a6b48371793a80fb587 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp.dts
+++ b/target/linux/mediatek/dts/mt7981b-gatonetworks-gdsp.dts
@@ -258,10 +258,13 @@
 };
 
 &wifi {
+       status = "okay";
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
+
        #address-cells = <1>;
        #size-cells = <0>;
-       mediatek,mtd-eeprom = <&factory 0x0>;
-       status = "okay";
 
        wifi_band_0: band@0 {
                reg = <0>;
@@ -302,7 +305,7 @@
                                reg = <0x40000 0x0010000>;
                        };
 
-                       factory: partition@50000 {
+                       partition@50000 {
                                label = "Factory";
                                reg = <0x50000 0x00B0000>;
                                read-only;
@@ -312,6 +315,10 @@
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
                                        macaddr_wifi: macaddr@4 {
                                                reg = <0x4 0x6>;
                                                compatible = "mac-base";

diff --git a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
index 05daa7f475ab1eaf51dce0071475359ab0e36156..2a280bbff9c35a7c7cc7a4e1148c15496fc1ec8b 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
+++ b/target/linux/mediatek/dts/mt7981b-glinet-gl-mt3000.dts
@@ -171,7 +171,7 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;
@@ -181,6 +181,10 @@
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
                                        macaddr: macaddr@a {
                                                compatible = "mac-base";
                                                reg = <0xa 0x6>;
@@ -236,7 +240,8 @@
 };
 
 &wifi {
-       mediatek,mtd-eeprom = <&factory 0x0>;
-
        status = "okay";
+
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
index 7b6e6dbce452c8f545029a94171597c1a7d929af..52de8b16966faae1403c4b14f0261df8b37f2f0d 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-h3c-magic-nx30-pro.dts
@@ -128,10 +128,20 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x0180000 0x0200000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+                               };
                        };
 
                        partition@380000 {
@@ -247,5 +257,6 @@
 &wifi {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-iptime-ax3000m.dts b/target/linux/mediatek/dts/mt7981b-iptime-ax3000m.dts
index 119d1487a59742ebf8f445be7196decda81c3898..f622187b506307275a976dda22a8aa7d17dd74fa 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-iptime-ax3000m.dts
+++ b/target/linux/mediatek/dts/mt7981b-iptime-ax3000m.dts
@@ -205,7 +205,7 @@
                                reg = <0x100000 0x80000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
index 9128d3496eb228571765577330bb57457bfe7749..d043f45cfa6b651bed5bc16bd8cc810a529b0a44 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-jcg-q30-pro.dts
@@ -119,7 +119,7 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x0180000 0x0200000>;
                                read-only;
@@ -129,6 +129,10 @@
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
                                        macaddr_wan: macaddr@a0024 {
                                                reg = <0xa0024 0x6>;
                                        };
@@ -233,5 +237,6 @@
 &wifi {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-netgear-eax17.dts b/target/linux/mediatek/dts/mt7981b-netgear-eax17.dts
index 55dce825517c811204cc4ab96b6bcb196796ec4a..8b40a6ec805a5ceddd1e6476d1fcd816405a534d 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-netgear-eax17.dts
+++ b/target/linux/mediatek/dts/mt7981b-netgear-eax17.dts
@@ -173,15 +173,18 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "factory";
                                reg = <0x180000 0x200000>;
-                               compatible = "nvmem-cells";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               eeprom_factory_0: eeprom@0 {
-                                       reg = <0x0 0x1000>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/mediatek/dts/mt7981b-openfi-6c.dts b/target/linux/mediatek/dts/mt7981b-openfi-6c.dts
index 06f3cec532f82a2b04f941074aa9b6d96e8c7209..169281041d54aa98b5ddc81921a03f7e2bddec69 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-openfi-6c.dts
+++ b/target/linux/mediatek/dts/mt7981b-openfi-6c.dts
@@ -162,7 +162,7 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
index 5ef9aa7ab074f259a3836affaa4cfc974c205fca..19b70578a41afbdd1a23ddec9026e1fbe1b72ed2 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
+++ b/target/linux/mediatek/dts/mt7981b-qihoo-360t7.dts
@@ -48,6 +48,16 @@
                label = "factory";
                reg = <0x7280000 0x80000>;
                read-only;
+
+               nvmem-layout {
+                       compatible = "fixed-layout";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       eeprom_factory_0: eeprom@0 {
+                               reg = <0x0 0x1000>;
+                       };
+               };
        };
 
        partition@7300000 {
@@ -60,5 +70,6 @@
 &wifi {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-tenbay-wr3000k.dts b/target/linux/mediatek/dts/mt7981b-tenbay-wr3000k.dts
index a7bef173440fdbe6055fde8312b388173c12a132..1d6ac14e2bf73f0f6cd4239413bccfca5dfd6c38 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-tenbay-wr3000k.dts
+++ b/target/linux/mediatek/dts/mt7981b-tenbay-wr3000k.dts
@@ -179,7 +179,7 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts b/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts
index cd0d926c3530b9565579b50531eababa25243620..1f406717dcb96e9c3053c3c9e3949185aeadcba7 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts
+++ b/target/linux/mediatek/dts/mt7981b-unielec-u7981-01-nand.dts
@@ -43,7 +43,7 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "factory";
                                reg = <0x180000 0x200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-wavlink-wl-3port-128nand-common.dtsi b/target/linux/mediatek/dts/mt7981b-wavlink-wl-3port-128nand-common.dtsi
index 238fb2b79001f67c60db2d0c5f0460d1ed296429..11167aba0aa8c87ecbec9f9572672eb3c18fa97f 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-wavlink-wl-3port-128nand-common.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-wavlink-wl-3port-128nand-common.dtsi
@@ -81,7 +81,7 @@
                                read-only;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "factory";
                                reg = <0x180000 0x200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn573hx3.dts b/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn573hx3.dts
index a732092c14e7e62fd50c3a574e7f66f94881cfb3..8033aee7024d1a336b240da03ab3f32bbc7c73bd 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn573hx3.dts
+++ b/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn573hx3.dts
@@ -110,7 +110,7 @@
                                read-only;
                        };
 
-                       factory: partition@50000 {
+                       partition@50000 {
                                label = "factory";
                                reg = <0x50000 0xb0000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn586x3.dts b/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn586x3.dts
index ed47a17fe77d3ef4dd8e6c1bd79e280dec3df0f4..f6b77cf3b7e13b3436e06588d742e06e371d18bb 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn586x3.dts
+++ b/target/linux/mediatek/dts/mt7981b-wavlink-wl-wn586x3.dts
@@ -155,7 +155,7 @@
                                read-only;
                        };
 
-                       factory: partition@50000 {
+                       partition@50000 {
                                label = "factory";
                                reg = <0x50000 0xb0000>;
                                read-only;
@@ -165,6 +165,10 @@
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
                                        macaddr_factory_4: macaddr@4 {
                                                compatible = "mac-base";
                                                reg = <0x4 0x6>;
@@ -263,7 +267,7 @@
 
 &wifi {
        status = "okay";
-       mediatek,mtd-eeprom = <&factory 0x0>;
-       nvmem-cells = <&macaddr_factory_4 0>;
-       nvmem-cell-names = "mac-address";
+
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_4 0>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };

diff --git a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-common.dtsi b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-common.dtsi
index be600a1a796d75d4f80508e41ce2e9c92d7b13c7..fdab9fe84f25e86849dac3a689383f6bf6c1f214 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-common.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-common.dtsi
@@ -346,7 +346,7 @@
                                reg = <0x140000 0x40000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts b/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts
index 6b95a173c9ec5d5513d043795a23004587e22373..2c02d860ced5ee4ca7ba3cf704d2c88267da34a6 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts
+++ b/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts
@@ -169,7 +169,7 @@
                                read-only;
                        };
 
-                       factory: partition@50000 {
+                       partition@50000 {
                                label = "Factory";
                                reg = <0x50000 0x10000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts
index 14a585e63ea0ae36b8b68ae0049469ea0d034db3..ed0433e95b8d238545f5c57c13c672f887c99aef 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts
+++ b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts
@@ -195,10 +195,28 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x0180000 0x0200000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
+                                       macaddr_factory_24: macaddr@24 {
+                                               reg = <0x24 0x6>;
+                                       };
+
+                                       macaddr_factory_2a: macaddr@2a {
+                                               reg = <0x2a 0x6>;
+                                       };
+                               };
                        };
 
                        partition@380000 {
@@ -313,19 +331,3 @@
        nvmem-cells = <&eeprom_factory>;
        nvmem-cell-names = "eeprom";
 };
-
-&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>;
-       };
-       eeprom_factory: eeprom@0 {
-               reg = <0x0 0x1000>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8103ax.dtsi b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8103ax.dtsi
index 6e8cff0bb5432a15ffba6ad2bfebce3c30c0cc00..ae05d3d646d9e4ac69df2d3f670cdebf47b54b16 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8103ax.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8103ax.dtsi
@@ -208,10 +208,38 @@
                                reg = <0x100000 0x80000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x200000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                               compatible = "mac-base";
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       macaddr_factory_a: macaddr@a {
+                                               reg = <0xa 0x6>;
+                                               compatible = "mac-base";
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       macaddr_factory_2a: macaddr@2a {
+                                               reg = <0x2a 0x6>;
+                                               compatible = "mac-base";
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@380000 {
@@ -276,31 +304,3 @@
                nvmem-cell-names = "mac-address";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       eeprom_factory: eeprom@0 {
-               reg = <0x0 0x1000>;
-       };
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-               compatible = "mac-base";
-               #nvmem-cell-cells = <1>;
-       };
-
-       macaddr_factory_a: macaddr@a {
-               reg = <0xa 0x6>;
-               compatible = "mac-base";
-               #nvmem-cell-cells = <1>;
-       };
-
-       macaddr_factory_2a: macaddr@2a {
-               reg = <0x2a 0x6>;
-               compatible = "mac-base";
-               #nvmem-cell-cells = <1>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8106ax.dtsi b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8106ax.dtsi
index 8a4d06d53b4b83a16c52961665d7cf23e7af7dec..63e74f38533a1dc2f7b89c712488f2065a837171 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8106ax.dtsi
+++ b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8106ax.dtsi
@@ -242,10 +242,38 @@
                                reg = <0x100000 0x80000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x200000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
+                                               compatible = "mac-base";
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       macaddr_factory_a: macaddr@a {
+                                               reg = <0xa 0x6>;
+                                               compatible = "mac-base";
+                                               #nvmem-cell-cells = <1>;
+                                       };
+
+                                       macaddr_factory_2a: macaddr@2a {
+                                               reg = <0x2a 0x6>;
+                                               compatible = "mac-base";
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@380000 {
@@ -320,31 +348,3 @@
        vusb33-supply = <&reg_3p3v>;
        vbus-supply = <&reg_5v>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-               compatible = "mac-base";
-               #nvmem-cell-cells = <1>;
-       };
-
-       macaddr_factory_a: macaddr@a {
-               reg = <0xa 0x6>;
-               compatible = "mac-base";
-               #nvmem-cell-cells = <1>;
-       };
-
-       macaddr_factory_2a: macaddr@2a {
-               reg = <0x2a 0x6>;
-               compatible = "mac-base";
-               #nvmem-cell-cells = <1>;
-       };
-
-       eeprom_factory: eeprom@0 {
-               reg = <0x0 0x1000>;
-       };
-};

diff --git a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
index 6d964ad2aa5fb9ddb833ee58839adc126d311398..ef30f71b9845504f00123210fd7beac78b6e3177 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
+++ b/target/linux/mediatek/dts/mt7981b-zyxel-nwa50ax-pro.dts
@@ -143,7 +143,7 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts b/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts
index 9396556cd7fd97129a7ed2c56e7ac29db2354170..aa0697fe89a7197695367d2077d58266f07996e4 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts
+++ b/target/linux/mediatek/dts/mt7986a-acer-predator-w6.dts
@@ -163,7 +163,8 @@
 };
 
 &slot0 {
-       radio0: mt7915@0,0 {
+       radio0: wifi@0,0 {
+               compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&eeprom_factory_a0000>, <&precal_factory_a1010>;
                nvmem-cell-names = "eeprom", "precal";

diff --git a/target/linux/mediatek/dts/mt7986a-acer-vero-w6m.dts b/target/linux/mediatek/dts/mt7986a-acer-vero-w6m.dts
index 683be1cf5087f99544d1a3d4241ff08e8bc191d1..562b1209ba29b6a5d38cfbacf3992f483c4c48bb 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-acer-vero-w6m.dts
+++ b/target/linux/mediatek/dts/mt7986a-acer-vero-w6m.dts
@@ -58,7 +58,8 @@
 };
 
 &slot0 {
-       radio0: mt7915@0,0 {
+       radio0: wifi@0,0 {
+               compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&eeprom_factory_a0000>, <&precal_factory_a1010>;
                nvmem-cell-names = "eeprom", "precal";

diff --git a/target/linux/mediatek/dts/mt7986a-netcore-n60.dts b/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
index 7e71e8a4b9c91144a993455943a4aa460810da9a..eefffd2f1f29d989ac771ffaf558fa1385531e37 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
+++ b/target/linux/mediatek/dts/mt7986a-netcore-n60.dts
@@ -203,10 +203,28 @@
                                reg = <0x0100000 0x0080000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x0180000 0x0200000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
+                                       macaddr_lan: macaddr@1fef20 {
+                                               reg = <0x1fef20 0x6>;
+                                       };
+
+                                       macaddr_wan: macaddr@1fef26 {
+                                               reg = <0x1fef26 0x6>;
+                                       };
+                               };
                        };
 
                        partition@380000 {
@@ -283,21 +301,6 @@
        pinctrl-names = "default";
        pinctrl-0 = <&wf_2g_5g_pins>;
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_lan: macaddr@1fef20 {
-                       reg = <0x1fef20 0x6>;
-               };
-
-               macaddr_wan: macaddr@1fef26 {
-                       reg = <0x1fef26 0x6>;
-               };
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi b/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi
index f71ef207f7aad96e26aaed0eee5d0e824014cbf8..046fa09315c7037daeb6645f0b387898d172fb06 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-smartrg-bonanza-peak.dtsi
@@ -360,7 +360,8 @@
                #address-cells = <3>;
                #size-cells = <2>;
 
-               radio0: mt7915@0,0 {
+               radio0: wifi@0,0 {
+                       compatible = "mediatek,mt76";
                        reg = <0x0000 0 0 0 0>;
 
                        nvmem-cells = <&eeprom_factory_a0000>, <&macaddr 4>;

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 62cce7fc089f402475109fcf95dc95bc12321d3e..c0412ba0c37bb7419990984aeafa54b287ccd322 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-tplink-tl-xdr-common.dtsi
@@ -200,10 +200,20 @@
                                };
                        };
 
-                       factory: partition@160000 {
+                       partition@160000 {
                                label = "factory";
                                reg = <0x160000 0x0060000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+                               };
                        };
 
                        partition@1c0000 {
@@ -275,8 +285,8 @@
 };
 
 &wifi {
-       mediatek,mtd-eeprom = <&factory 0x0>;
-       nvmem-cells = <&macaddr_config_1c 2>;
-       nvmem-cell-names = "mac-address";
        status = "okay";
+
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_config_1c 2>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };

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 09910347036bb8048a2eb384493e50f253836025..3071e42b6db1cb446ccbafe0ce6c192c30e970a1 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dtsi
@@ -161,7 +161,7 @@
                                reg = <0x140000 0x40000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x200000>;
                                read-only;
@@ -171,6 +171,10 @@
                                        #address-cells = <1>;
                                        #size-cells = <1>;
 
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
                                        macaddr_factory_4: macaddr@4 {
                                                compatible = "mac-base";
                                                reg = <0x4 0x6>;
@@ -275,7 +279,8 @@
        pinctrl-names = "default";
        pinctrl-0 = <&wf_2g_5g_pins>;
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &uart0 {

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 fa64c1f4870aaa0df9e312011fad43dc4aca791f..00f7a0a19c139af351acaf1b106598602ce467d0 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-stock.dts
@@ -31,7 +31,7 @@
                reg = <0x100000 0x80000>;
        };
 
-       factory: partition@180000 {
+       partition@180000 {
                label = "Factory";
                reg = <0x180000 0x200000>;
                read-only;

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 5fb6c66ea14e40e14568b14e395a78725456eac8..10e93014597bb92190ca184ce22930cea89c3c8d 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5601-t0-ubootmod.dts
@@ -30,7 +30,7 @@
                read-only;
        };
 
-       factory: partition@180000 {
+       partition@180000 {
                label = "factory";
                reg = <0x180000 0x200000>;
                read-only;

diff --git a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
index 97f498ba8c45ae06fdf68948f08e264d900423b0..ab54bdb0ec6d59244b59749f6ffac4d286f94dc9 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
+++ b/target/linux/mediatek/dts/mt7986a-zyxel-ex5700-telenor.dts
@@ -270,7 +270,9 @@
                wifi@0,0 {
                        compatible = "mediatek,mt76";
                        reg = <0x0000 0 0 0 0>;
-                       mediatek,mtd-eeprom = <&factory 0xa0000>;
+
+                       nvmem-cells = <&eeprom_factory_a0000>;
+                       nvmem-cell-names = "eeprom";
                };
        };
 };
@@ -288,7 +290,8 @@
        pinctrl-names = "default";
        pinctrl-0 = <&wf_5g_pins>;
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &pio {
@@ -369,10 +372,24 @@
                                label = "u-boot-env";
                                reg = <0x100000 0x80000>;
                        };
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x200000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
+                                       eeprom_factory_a0000: eeprom@a0000 {
+                                               reg = <0xa0000 0xe00>;
+                                       };
+                               };
                        };
                        partition@380000 {
                                label = "FIP";

diff --git a/target/linux/mediatek/dts/mt7986b-buffalo-wsr-6000ax8.dts b/target/linux/mediatek/dts/mt7986b-buffalo-wsr-6000ax8.dts
index 02b68574b822ece6454ad26e199010d69b9a04d2..8e7a69152547ae467deb9186a43e3da147ca9d2a 100644 (file)
--- a/target/linux/mediatek/dts/mt7986b-buffalo-wsr-6000ax8.dts
+++ b/target/linux/mediatek/dts/mt7986b-buffalo-wsr-6000ax8.dts
@@ -296,7 +296,7 @@
                                reg = <0x100000 0x80000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts b/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
index b8dd2f5290164c7bfe9b5fc481bf1aa9e49f80be..9a9f47be98727079b8bc672e0009a50df8d256cf 100644 (file)
--- a/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
+++ b/target/linux/mediatek/dts/mt7986b-netgear-wax220.dts
@@ -208,9 +208,19 @@
                                reg = <0x100000 0x80000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x200000>;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+                               };
                        };
 
                        partition@380000 {
@@ -290,5 +300,6 @@
        pinctrl-0 = <&wf_2g_5g_pins>;
        pinctrl-1 = <&wf_dbdc_pins>;
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/dts/mt7987a-glinet-gl-mt3600be.dts b/target/linux/mediatek/dts/mt7987a-glinet-gl-mt3600be.dts
index 784e134fff44a732f4ed70b4427979b402d63491..aeb5051d62cd72554bc38f0d346bb4ef1a27843b 100644 (file)
--- a/target/linux/mediatek/dts/mt7987a-glinet-gl-mt3600be.dts
+++ b/target/linux/mediatek/dts/mt7987a-glinet-gl-mt3600be.dts
@@ -137,7 +137,7 @@
        pcie@0,0 {
                reg = <0x0000 0 0 0 0>;
 
-               mt7990@0,0 {
+               wifi@0,0 {
                        compatible = "mediatek,mt76";
                        reg = <0x0000 0 0 0 0>;
                        #address-cells = <1>;

diff --git a/target/linux/mediatek/dts/mt7987a-rfb-emmc.dtso b/target/linux/mediatek/dts/mt7987a-rfb-emmc.dtso
index 2a6f96a2a0a3469d50c99834096ce85ac21d40fb..a09bd0b83385676570c3648dffd15768341a9363 100644 (file)
--- a/target/linux/mediatek/dts/mt7987a-rfb-emmc.dtso
+++ b/target/linux/mediatek/dts/mt7987a-rfb-emmc.dtso
@@ -89,7 +89,8 @@
                __overlay__ {
                        slot0: pcie@0,0 {
                                reg = <0x0000 0 0 0 0>;
-                               mt7996@0,0 {
+                               wifi@0,0 {
+                                       compatible = "mediatek,mt76";
                                        reg = <0x0000 0 0 0 0>;
                                        nvmem-cells = <&eeprom_factory_0>;
                                        nvmem-cell-names = "eeprom";

diff --git a/target/linux/mediatek/dts/mt7987a-rfb-spim-nand.dtso b/target/linux/mediatek/dts/mt7987a-rfb-spim-nand.dtso
index cd19574d317b2530bf074962ebe892a8159656fc..daeaa88029dcdd5c2228f91effd155a9fff1ea4e 100644 (file)
--- a/target/linux/mediatek/dts/mt7987a-rfb-spim-nand.dtso
+++ b/target/linux/mediatek/dts/mt7987a-rfb-spim-nand.dtso
@@ -37,7 +37,7 @@
                                                reg = <0x0100000 0x0080000>;
                                        };
 
-                                       factory: partition@180000 {
+                                       partition@180000 {
                                                label = "Factory";
                                                reg = <0x180000 0x0400000>;
 
@@ -46,6 +46,10 @@
                                                        #address-cells = <1>;
                                                        #size-cells = <1>;
 
+                                                       eeprom_factory_0: eeprom@0 {
+                                                               reg = <0x0 0x1e00>;
+                                                       };
+
                                                        gmac2_mac: eeprom@fffee {
                                                                reg = <0xfffee 0x6>;
                                                        };
@@ -94,11 +98,12 @@
                        slot0: pcie@0,0 {
                                reg = <0x0000 0 0 0 0>;
 
-                               mt7996@0,0 {
+                               wifi@0,0 {
                                        compatible = "mediatek,mt76";
                                        reg = <0x0000 0 0 0 0>;
                                        device_type = "pci";
-                                       mediatek,mtd-eeprom = <&factory 0x0>;
+                                       nvmem-cells = <&eeprom_factory_0>;
+                                       nvmem-cell-names = "eeprom";
                                };
                        };
                };

diff --git a/target/linux/mediatek/dts/mt7987a-routerich-be7200.dts b/target/linux/mediatek/dts/mt7987a-routerich-be7200.dts
index 6906b91d67f97408e7c5ecb3d2d479ea068e64a3..a259dd8ad99a47d4ef6526bc5274d8f4ad1291ef 100644 (file)
--- a/target/linux/mediatek/dts/mt7987a-routerich-be7200.dts
+++ b/target/linux/mediatek/dts/mt7987a-routerich-be7200.dts
@@ -329,7 +329,7 @@
                #address-cells = <3>;
                #size-cells = <2>;
 
-               mt7992@0,0 {
+               wifi@0,0 {
                        compatible = "mediatek,mt76";
                        reg = <0x0000 0 0 0 0>;
 

diff --git a/target/linux/mediatek/dts/mt7987a-tenda-be12-pro.dts b/target/linux/mediatek/dts/mt7987a-tenda-be12-pro.dts
index 7bb6b27c8b5ecfdd4ade0b904ad923312b7c5051..368b7366218522d95344eeef03add3be943fb35e 100644 (file)
--- a/target/linux/mediatek/dts/mt7987a-tenda-be12-pro.dts
+++ b/target/linux/mediatek/dts/mt7987a-tenda-be12-pro.dts
@@ -355,7 +355,7 @@
                #address-cells = <3>;
                #size-cells = <2>;
 
-               mt7992@0,0 {
+               wifi@0,0 {
                        compatible = "mediatek,mt76";
                        reg = <0x0000 0 0 0 0>;
 

diff --git a/target/linux/mediatek/dts/mt7988a-arcadyan-mozart.dts b/target/linux/mediatek/dts/mt7988a-arcadyan-mozart.dts
index 41bb4415f7fae581702c02077035b2f379a8f377..c6cc00009667ef308a14fd349e375e60fb96d61e 100644 (file)
--- a/target/linux/mediatek/dts/mt7988a-arcadyan-mozart.dts
+++ b/target/linux/mediatek/dts/mt7988a-arcadyan-mozart.dts
@@ -311,7 +311,8 @@
                #address-cells = <3>;
                #size-cells = <2>;
 
-               mt7996@0,0 {
+               wifi@0,0 {
+                       compatible = "mediatek,mt76";
                        reg = <0x0000 0 0 0 0>;
                        nvmem-cells = <&eeprom_factory_0>;
                        nvmem-cell-names = "eeprom";

diff --git a/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi b/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi
index 2de677f9b021fc5d74c30957ef39d36cf18adafe..51e5d3c172af18359961e2ba35d6eb9e32944adf 100644 (file)
--- a/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi
+++ b/target/linux/mediatek/dts/mt7988a-smartrg-mt-stuart.dtsi
@@ -560,7 +560,8 @@
                #address-cells = <3>;
                #size-cells = <2>;
 
-               mt7996@0,0 {
+               wifi@0,0 {
+                       compatible = "mediatek,mt76";
                        reg = <0x0000 0 0 0 0>;
                        #address-cells = <1>;
                        #size-cells = <0>;

diff --git a/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi b/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi
index e5c33fb5d08fe7f0987eefe1af304cc24b2abd70..dd12c33a162f5de344df32ec0370129deb7e0e64 100644 (file)
--- a/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi
+++ b/target/linux/mediatek/dts/mt7988d-asus-zenwifi-bt8.dtsi
@@ -285,7 +285,8 @@
                #address-cells = <3>;
                #size-cells = <2>;
 
-               mt7996_wifi: mt7996@0,0 {
+               mt7996_wifi: wifi@0,0 {
+                       compatible = "mediatek,mt76";
                        reg = <0x0000 0 0 0 0>;
                };
        };

diff --git a/target/linux/mediatek/dts/mt7988d-keenetic-kn-1812.dtsi b/target/linux/mediatek/dts/mt7988d-keenetic-kn-1812.dtsi
index e2ae6d474c61e7f93f856bf3f905077adc157dc3..8cf21ffd9c5a0413d6b58ff2d3ee250c54a6b695 100644 (file)
--- a/target/linux/mediatek/dts/mt7988d-keenetic-kn-1812.dtsi
+++ b/target/linux/mediatek/dts/mt7988d-keenetic-kn-1812.dtsi
@@ -504,7 +504,8 @@
                #address-cells = <3>;
                #size-cells = <2>;
 
-               mt7992@0,0 {
+               wifi@0,0 {
+                       compatible = "mediatek,mt76";
                        reg = <0x0000 0 0 0 0>;
                        #address-cells = <1>;
                        #size-cells = <0>;

diff --git a/target/linux/mediatek/dts/mt7988d-tplink-be450.dts b/target/linux/mediatek/dts/mt7988d-tplink-be450.dts
index d40f70e941e0ffeda966b262097565028a668e56..6961d3485119550a6b2b94a26188a4b2c72c6867 100644 (file)
--- a/target/linux/mediatek/dts/mt7988d-tplink-be450.dts
+++ b/target/linux/mediatek/dts/mt7988d-tplink-be450.dts
@@ -320,7 +320,8 @@
                #address-cells = <3>;
                #size-cells = <2>;
 
-               mt7996@0,0 {
+               wifi@0,0 {
+                       compatible = "mediatek,mt76";
                        reg = <0x0000 0 0 0 0>;
                };
        };

diff --git a/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7981-rfb-spim-nand.dtso b/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7981-rfb-spim-nand.dtso
index 7e731cd43395ee1fbce4f569275634b5e75e3f2e..2251352d8201ed716628f28df7ec58f99dc986b6 100644 (file)
--- a/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7981-rfb-spim-nand.dtso
+++ b/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7981-rfb-spim-nand.dtso
@@ -40,9 +40,19 @@
                                                reg = <0x0100000 0x0080000>;
                                        };
 
-                                       factory: partition@180000 {
+                                       partition@180000 {
                                                label = "Factory";
                                                reg = <0x180000 0x0200000>;
+
+                                               nvmem-layout {
+                                                       compatible = "fixed-layout";
+                                                       #address-cells = <1>;
+                                                       #size-cells = <1>;
+
+                                                       eeprom_factory_0: eeprom@0 {
+                                                               reg = <0x0 0x1000>;
+                                                       };
+                                               };
                                        };
 
                                        partition@380000 {
@@ -69,8 +79,10 @@
        fragment@2 {
                target = <&wifi>;
                __overlay__ {
-                       mediatek,mtd-eeprom = <&factory 0x0>;
                        status = "okay";
+
+                       nvmem-cells = <&eeprom_factory_0>;
+                       nvmem-cell-names = "eeprom";
                };
        };
 };

diff --git a/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts b/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
index 79a6df7d6b3dac043cfb2e2fb49d140aa4f2434d..aefae829ce3f47689503d3cf9e2470fa0b254f2d 100644 (file)
--- a/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
+++ b/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
@@ -29,9 +29,19 @@
                                label = "u-boot-env";
                                reg = <0x0100000 0x0080000>;
                        };
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+                               };
                        };
                        partition@380000 {
                                label = "FIP";
@@ -46,5 +56,6 @@
 };
 
 &wifi {
-       mediatek,mtd-eeprom = <&factory 0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts b/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
index 009d2e1adff841a045b8257fdec51aa455266fce..bdb32de04da8d33c790f9646f036cb22ea968bbd 100644 (file)
--- a/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
+++ b/target/linux/mediatek/files-6.18/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
@@ -28,9 +28,19 @@
                                label = "u-boot-env";
                                reg = <0x40000 0x0010000>;
                        };
-                       factory: partition@50000 {
+                       partition@50000 {
                                label = "Factory";
                                reg = <0x50000 0x00B0000>;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+                               };
                        };
                        partition@100000 {
                                label = "FIP";
@@ -45,5 +55,6 @@
 };
 
 &wifi {
-       mediatek,mtd-eeprom = <&factory 0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/mediatek/patches-6.18/863-arm64-dts-mt7986-add-sound-wm8960.patch b/target/linux/mediatek/patches-6.18/863-arm64-dts-mt7986-add-sound-wm8960.patch
index db51bf17791b75cfc11071b62102469b36d1f420..860c9222c9877ae2faf2edf307fed5ecd4985b52 100644 (file)
--- a/target/linux/mediatek/patches-6.18/863-arm64-dts-mt7986-add-sound-wm8960.patch
+++ b/target/linux/mediatek/patches-6.18/863-arm64-dts-mt7986-add-sound-wm8960.patch
@@ -46,9 +46,9 @@ Subject: [PATCH] arm64: dts: mt7986: add sound wm8960
  };
  
  &spi0 {
-@@ -48,3 +78,13 @@
- &wifi {
-       mediatek,mtd-eeprom = <&factory 0>;
+@@ -59,3 +89,13 @@
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
  };
 +
 +&pio {