ramips: convert MT7628 EEPROM to NVMEM format

This patch converts MT7628 WiFi calibration data to NVMEM format. The
EEPROM size is 0x400.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>

diff --git a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts
index f5cff3bb609a63f165d7e396200aa289c88d5c2d..67f4d07f3afeb6aadff21424bc478ed2221f84ad 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts
+++ b/target/linux/ramips/dts/mt7628an_alfa-network_awusfree1.dts
@@ -114,9 +114,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_2e: macaddr@2e {
+                                       reg = <0x2e 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -131,15 +142,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_2e: macaddr@2e {
-               reg = <0x2e 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_asus_rt-ac1200.dtsi b/target/linux/ramips/dts/mt7628an_asus_rt-ac1200.dtsi
index dbba801425e654b99859719268d50991dd58cf0c..746436570fc8be8a4be79136b6e4904cd0e04101 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_asus_rt-ac1200.dtsi
+++ b/target/linux/ramips/dts/mt7628an_asus_rt-ac1200.dtsi
@@ -73,13 +73,16 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               read-only;
-
-                               compatible = "nvmem-cells";
                                #address-cells = <1>;
                                #size-cells = <1>;
+                               read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
 
                                macaddr_factory_4: macaddr@4 {
                                        reg = <0x4 0x6>;
@@ -117,7 +120,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &pcie {

diff --git a/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi b/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi
index 8fd86dcb16f1dac8339d52b5f4335f55667e4e43..7404853f8cd43c825b4d36ad9bdf8adbf1843a97 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi
+++ b/target/linux/ramips/dts/mt7628an_asus_rt-n1x.dtsi
@@ -75,9 +75,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -101,7 +112,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &state_default {
@@ -122,13 +134,3 @@
 &ohci {
        status = "disabled";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
index c3ea41bbf6684d71c941d83509d32a51cd1558f5..4f37fb89404a7cb8b18b23adbad9f22ca9c14ecf 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
+++ b/target/linux/ramips/dts/mt7628an_buffalo_wcr-1166ds.dts
@@ -140,9 +140,16 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
                        };
 
                        partition@50000 {
@@ -175,5 +182,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts b/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
index bec9e9518258c210f72ec857700bf6dc79ed5628..6a7bdfab079a174f40b4a56e96692896a6689c91 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
+++ b/target/linux/ramips/dts/mt7628an_comfast_cf-wr617ac.dts
@@ -77,6 +77,10 @@
                                #size-cells = <1>;
                                read-only;
 
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
                                macaddr_factory_8004: macaddr@8004 {
                                        reg = <0x8004 0x6>;
                                };
@@ -122,5 +126,6 @@
 
 &wmac {
        status = "okay";
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_comfast_cf-wr758ac.dtsi b/target/linux/ramips/dts/mt7628an_comfast_cf-wr758ac.dtsi
index 6ac53adf520079482e915fbd43ace082c85a996b..4993e15f24e6c2cb7535094ae63cf63bef6a19ae 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_comfast_cf-wr758ac.dtsi
+++ b/target/linux/ramips/dts/mt7628an_comfast_cf-wr758ac.dtsi
@@ -84,9 +84,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       reg = <0xe000 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -101,7 +112,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -112,13 +124,3 @@
 &esw {
        mediatek,portdisable = <0x2f>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_e000: macaddr@e000 {
-               reg = <0xe000 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
index 82f0e7c690a0e7d0bd0b047d5b48b0f572ea0223..bbdd6fe35f36a69dee2ed8aa22b79fa52741bb9e 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
+++ b/target/linux/ramips/dts/mt7628an_cudy_wr1000.dts
@@ -89,9 +89,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -132,7 +143,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -143,13 +155,3 @@
 &esw {
        mediatek,portmap = <0x2f>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_dlink_dap-1325-a1.dts b/target/linux/ramips/dts/mt7628an_dlink_dap-1325-a1.dts
index 5b50674f0b42017c377c7aa7c98b2408139c8e1d..0bc81291d73b756efe0702c51cb752f9c96c2f2b 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_dlink_dap-1325-a1.dts
+++ b/target/linux/ramips/dts/mt7628an_dlink_dap-1325-a1.dts
@@ -82,7 +82,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 
        nvmem-cells = <&macaddr_factory_28>;
        nvmem-cell-names = "mac-address";
@@ -114,9 +115,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -127,13 +139,3 @@
                };
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_elecom_wrc-1167fs.dts b/target/linux/ramips/dts/mt7628an_elecom_wrc-1167fs.dts
index f716ad9f23ba2776a22c1041b91ad47de148a6b2..f795838f8f22562ae5e5338ebaef2a97d8c53b6f 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_elecom_wrc-1167fs.dts
+++ b/target/linux/ramips/dts/mt7628an_elecom_wrc-1167fs.dts
@@ -102,9 +102,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -163,15 +174,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
index a3ce8cc59212cfd6776afe4823844f14ae89ac81..2142eaa096e3ee6e6386343f07e9eb97eba141cf 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
+++ b/target/linux/ramips/dts/mt7628an_glinet_gl-mt300n-v2.dts
@@ -88,7 +88,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &spi0 {
@@ -117,9 +118,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -134,13 +146,3 @@
 &uart1 {
        status = "okay";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi
index 089a3f3c42780bcb45845af047fb73e64ea1e671..eea070a03ad3e69c2a3598b3474309c6e5d425c1 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi
+++ b/target/linux/ramips/dts/mt7628an_glinet_vixmini_microuter.dtsi
@@ -60,7 +60,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &spi0 {
@@ -89,9 +90,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        /*
@@ -105,13 +117,3 @@
                };
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_hak5_wifi-pineapple-mk7.dts b/target/linux/ramips/dts/mt7628an_hak5_wifi-pineapple-mk7.dts
index 2901a2af51a82c490e2d7d80156ff7ffb2e9a1b8..18ff6c75afad8553dfbb28df0dc4384eb067bc71 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hak5_wifi-pineapple-mk7.dts
+++ b/target/linux/ramips/dts/mt7628an_hak5_wifi-pineapple-mk7.dts
@@ -101,9 +101,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -125,15 +136,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
index b7c3af796d5aa8442d39e03dbda8097f1380b69c..d7d4965328a8189f5936e9433532e6ef9309a325 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
+++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
@@ -67,9 +67,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -89,15 +100,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7688a.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7688a.dts
index 2c7299af72fa13936314549f555e86c0b3b7ffae..5357996e92b285537b44a26c468deeb32f25b490 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7688a.dts
+++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7688a.dts
@@ -81,9 +81,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -115,15 +126,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts
index 08bdcd73adab1bf4f2edb0e4f50324ac95dfb129..a3ca7b9c84387779dffb8baf59b10dc03c1d8667 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts
+++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5861b.dts
@@ -53,13 +53,3 @@
                };
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_2e: macaddr@2e {
-               reg = <0x2e 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi b/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi
index bfc510e06feae05bb0a605357acef98cca25d248..ad8d6cbfe1727e35d255f4198021ec10a736da0e 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi
+++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5x61a.dtsi
@@ -57,9 +57,24 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
+
+                               macaddr_factory_2e: macaddr@2e {
+                                       reg = <0x2e 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -97,15 +112,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_iptime.dtsi b/target/linux/ramips/dts/mt7628an_iptime.dtsi
index ccc6debfc9bcf3b9244f4ac7e64e8081c392e40a..3f81fb56a7151eb5baa64f77c192be2cd333b45f 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_iptime.dtsi
+++ b/target/linux/ramips/dts/mt7628an_iptime.dtsi
@@ -43,9 +43,16 @@
                        #size-cells = <1>;
 
                        uboot: partition@0 {
+                               compatible = "nvmem-cells";
                                label = "u-boot";
                                reg = <0x0 0x20000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               macaddr_uboot_1fc20: macaddr@1fc20 {
+                                       reg = <0x1fc20 0x6>;
+                               };
                        };
 
                        partition@20000 {
@@ -55,9 +62,16 @@
                        };
 
                        factory: partition@30000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x30000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
                        };
 
                        partition@40000 {
@@ -105,15 +119,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&uboot {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_uboot_1fc20: macaddr@1fc20 {
-               reg = <0x1fc20 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi
index 2d2f8a58b8d0622d3df6005b25aef624e7737364..a9ce7680d6fff599b6cc4742f708f674d2d6e70b 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi
+++ b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi
@@ -81,9 +81,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        firmware: partition@50000 {
@@ -124,15 +135,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_keenetic_kn-1613.dts b/target/linux/ramips/dts/mt7628an_keenetic_kn-1613.dts
index 4281682503a39d3613ae743311f99e11b037f1f2..510bada246dc6c9e1a4bbbcad69712e2217800da 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_keenetic_kn-1613.dts
+++ b/target/linux/ramips/dts/mt7628an_keenetic_kn-1613.dts
@@ -130,9 +130,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "rf-eeprom";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        firmware1: partition@50000 {
@@ -196,7 +207,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &pcie {
@@ -211,13 +223,3 @@
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_kroks.dtsi b/target/linux/ramips/dts/mt7628an_kroks.dtsi
index dc1eee9ccaba4ab19c53966643da1b6659164b08..186f8e16edd6836de34efd840472e1260ae01dbd 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_kroks.dtsi
+++ b/target/linux/ramips/dts/mt7628an_kroks.dtsi
@@ -65,8 +65,19 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -90,16 +101,6 @@
        };
 };
 
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};
-
 &ethernet {
        nvmem-cells = <&macaddr_factory_4>;
        nvmem-cell-names = "mac-address";
@@ -108,7 +109,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0000>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &uart1 {

diff --git a/target/linux/ramips/dts/mt7628an_linksys_e5400.dts b/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
index 3a6403fe7f8df9b83e2802ebc8d25134810851ae..ed1479dcd8f3dbd5272c3c67871d914ca117f637 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
+++ b/target/linux/ramips/dts/mt7628an_linksys_e5400.dts
@@ -78,13 +78,16 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
-                               read-only;
-
-                               compatible = "nvmem-cells";
                                #address-cells = <1>;
                                #size-cells = <1>;
+                               read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
 
                                macaddr_factory_28: macaddr@28 {
                                        reg = <0x28 0x6>;
@@ -155,9 +158,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-       nvmem-cells = <&macaddr_factory_28>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_28>;
+       nvmem-cell-names = "eeprom", "mac-address";
        mac-address-increment = <2>;
 };
 

diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
index 57624c302ebfa7e63e0a038258e154718fa892d9..c693e69f2c31f07b96a7fc32d0e746b35ff80965 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
+++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
@@ -108,9 +108,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_2e: macaddr@2e {
+                                       reg = <0x2e 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -159,15 +170,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_2e: macaddr@2e {
-               reg = <0x2e 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts
index 4dede4287f59801aea6bf8e168a5e1af598076f8..9210451c16ee9889dfeaea7f6649af5e47fdeda1 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts
+++ b/target/linux/ramips/dts/mt7628an_mediatek_mt7628an-eval-board.dts
@@ -38,9 +38,16 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
                        };
 
                        partition@50000 {
@@ -55,5 +62,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts
index f712a280c5c1c255af16d13ff1c8a2793527561f..4a7915b9f0026c1a29c0b1e698fa63358ed8faf0 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts
+++ b/target/linux/ramips/dts/mt7628an_mercury_mac1200r-v2.dts
@@ -43,9 +43,20 @@
                        };
 
                        factory: partition@1d800 {
+                               compatible = "nvmem-cells";
                                label = "factory_info";
                                reg = <0x1d800 0x800>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_d: macaddr@d {
+                                       reg = <0xd 0x6>;
+                               };
                        };
 
                        art: partition@1e000 {
@@ -86,7 +97,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &pcie {
@@ -100,13 +112,3 @@
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_d: macaddr@d {
-               reg = <0xd 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_minew_g1-c.dts b/target/linux/ramips/dts/mt7628an_minew_g1-c.dts
index 92fbf7c6ae5ab1f4b4319d55071d4f03e4b47ab3..e7a67b72c148e427a30f5145ff0a4d4c45e9ca55 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_minew_g1-c.dts
+++ b/target/linux/ramips/dts/mt7628an_minew_g1-c.dts
@@ -105,9 +105,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -131,20 +142,11 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &sdhci {
        status = "okay";
        mediatek,cd-high;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts b/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
index 2179c48b22835aa968341ced2cfa3d6e41c840b3..b852c11e06f3210173f4857001d530a7cee1c8d0 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
+++ b/target/linux/ramips/dts/mt7628an_motorola_mwr03.dts
@@ -68,9 +68,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -127,15 +138,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
index e6374e7bac829e6c1ef657af6778548107f0ee75..a6fa581b7d65c47c0b77ee32994df29a916c4203 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6xxx.dtsi
@@ -80,9 +80,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x20000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        partition@60000 {
@@ -97,7 +108,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -116,13 +128,3 @@
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
index b10d448a30a2995309b697b7e849de71d92c1d47..79d1fbc335e0b1e6977825bc2d015dacb27c5067 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
@@ -118,9 +118,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        firmware: partition@50000 {
@@ -164,15 +175,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
index 61f78c162cbc922552325e8292fc5cc86f113200..ecdfa13e69cca05b5bb16e8a6bc5b42d88e52e31 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
+++ b/target/linux/ramips/dts/mt7628an_rakwireless_rak633.dts
@@ -52,9 +52,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -94,15 +105,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts b/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts
index 5c3b14f87f2af34dd64f0d5a72dd6269ab4529d8..e8cb360cca02449d4a5176a2505d7d84ba2206d9 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts
+++ b/target/linux/ramips/dts/mt7628an_ravpower_rp-wd009.dts
@@ -137,9 +137,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -183,20 +194,11 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
        nvmem-cells = <&macaddr_factory_4>;
        nvmem-cell-names = "mac-address";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
index 174272f95fdd0d3794e53af29ee90bbba7b92c5c..bfb1bd808a18a4b095b0b13600c51ce24623955f 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
+++ b/target/linux/ramips/dts/mt7628an_skylab_skw92a.dts
@@ -54,7 +54,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &spi0 {
@@ -83,9 +84,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -100,13 +112,3 @@
 &uart1 {
        status = "okay";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_tama_w06.dts b/target/linux/ramips/dts/mt7628an_tama_w06.dts
index 7a202eb6ef7f085b733a0ac362806ce129a408a0..7f00db99867e6b80749844323e9f454db0858ab1 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tama_w06.dts
+++ b/target/linux/ramips/dts/mt7628an_tama_w06.dts
@@ -75,9 +75,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -98,15 +109,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
index 9d1c930d762dd3111586d78dcc7d6e3e8b775e18..4de621196c125f6b6d111cea58a48194dc617740 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
+++ b/target/linux/ramips/dts/mt7628an_totolink_lr1200.dts
@@ -108,7 +108,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -142,9 +143,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -155,13 +167,3 @@
                };
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
index d7c65d4703e28f4c0f116174de125e6657ca1469..edf5d89054a42e37c1899be5e955b5fa8dd843d8 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi
@@ -53,9 +53,16 @@
                        };
 
                        rom: partition@7d0000 {
+                               compatible = "nvmem-cells";
                                label = "rom";
                                reg = <0x7d0000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               macaddr_rom_f100: macaddr@f100 {
+                                       reg = <0xf100 0x6>;
+                               };
                        };
 
                        partition@7e0000 {
@@ -64,9 +71,16 @@
                        };
 
                        radio: partition@7f0000 {
+                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0x7f0000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_radio_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
                        };
                };
        };
@@ -75,10 +89,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&radio 0x0>;
-
-       nvmem-cells = <&macaddr_rom_f100>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&eeprom_radio_0>, <&macaddr_rom_f100>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &ethernet {
@@ -89,13 +101,3 @@
 &esw {
        mediatek,portmap = <0x3e>;
 };
-
-&rom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_rom_f100: macaddr@f100 {
-               reg = <0xf100 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
index ecb6ce1e4eaf692433e3b08f53b8606eb42b94f8..4e4e3c735a1ce261f989c78745b71af9a637707a 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
@@ -45,9 +45,20 @@
                        };
 
                        factory: partition@7d0000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x7d0000 0x30000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               macaddr_factory_f100: macaddr@f100 {
+                                       reg = <0xf100 0x6>;
+                               };
+
+                               eeprom_factory_20000: eeprom@20000 {
+                                       reg = <0x20000 0x400>;
+                               };
                        };
                };
        };
@@ -56,23 +67,11 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x20000>;
-
-       nvmem-cells = <&macaddr_factory_f100>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &ethernet {
        nvmem-cells = <&macaddr_factory_f100>;
        nvmem-cell-names = "mac-address";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_f100: macaddr@f100 {
-               reg = <0xf100 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
index 1a8b26b1cce3e8218ee75f3df7dec994e584dab6..d129acec0cc3409a85e90478e28fc10f881b49b2 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
@@ -96,15 +96,29 @@
                        };
 
                        config: partition@7c0000 {
+                               compatible = "nvmem-cells";
                                label = "config";
                                reg = <0x7c0000 0x30000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               macaddr_config_2008: macaddr@2008 {
+                                       reg = <0x2008 0x6>;
+                               };
                        };
 
                        radio: partition@7f0000 {
+                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0x7f0000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_radio_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
                        };
                };
        };
@@ -126,10 +140,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&radio 0x0>;
-
-       nvmem-cells = <&macaddr_config_2008>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008>;
+       nvmem-cell-names = "eeprom", "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -147,13 +159,3 @@
                mac-address-increment = <2>;
        };
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_2008: macaddr@2008 {
-               reg = <0x2008 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
index 7948668b84781d8e8cf037e35511879030f1358d..6b52583273420bb7fd94d6f99a44579d2b4f03be 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
@@ -33,9 +33,16 @@
                        };
 
                        config: partition@600000 {
+                               compatible = "nvmem-cells";
                                label = "config";
                                reg = <0x600000 0x50000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               macaddr_config_10008: macaddr@10008 {
+                                       reg = <0x10008 0x6>;
+                               };
                        };
 
                        /*
@@ -44,9 +51,16 @@
                        */
 
                        radio: partition@7f0000 {
+                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0x7f0000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_radio_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
                        };
                };
        };
@@ -61,10 +75,8 @@
 };
 
 &wmac {
-       mediatek,mtd-eeprom = <&radio 0x0>;
-
-       nvmem-cells = <&macaddr_config_10008>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_10008>;
+       nvmem-cell-names = "eeprom", "mac-address";
        mac-address-increment = <1>;
 };
 
@@ -72,13 +84,3 @@
        nvmem-cells = <&macaddr_config_10008>;
        nvmem-cell-names = "mac-address";
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_10008: macaddr@10008 {
-               reg = <0x10008 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts
index 21df0fb3e69d6f2ed94d32a3bda498e6030ab9b3..9f80bd57fb10af3010a04b0f800aa04b4c362726 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v3.dts
@@ -33,15 +33,29 @@
                        };
 
                        config: partition@7c0000 {
+                               compatible = "nvmem-cells";
                                label = "config";
                                reg = <0x7c0000 0x30000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               macaddr_config_2008: macaddr@2008 {
+                                       reg = <0x2008 0x6>;
+                               };
                        };
 
                        radio: partition@7f0000 {
+                               compatible = "nvmem-cells";
                                label = "radio";
                                reg = <0x7f0000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_radio_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
                        };
                };
        };
@@ -56,10 +70,8 @@
 };
 
 &wmac {
-       mediatek,mtd-eeprom = <&radio 0x0>;
-
-       nvmem-cells = <&macaddr_config_2008>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&eeprom_radio_0>, <&macaddr_config_2008>;
+       nvmem-cell-names = "eeprom", "mac-address";
        mac-address-increment = <(-1)>;
 };
 
@@ -67,13 +79,3 @@
        nvmem-cells = <&macaddr_config_2008>;
        nvmem-cell-names = "mac-address";
 };
-
-&config {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_config_2008: macaddr@2008 {
-               reg = <0x2008 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts
index 3ffa732541113a92958300c425ff1c417785ff98..3828d859cafe520084f30f7a1f43216494dd45f8 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr3020-v3.dts
@@ -121,9 +121,20 @@
                        };
 
                        factory: partition@7d0000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x7d0000 0x30000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_20000: eeprom@20000 {
+                                       reg = <0x20000 0x400>;
+                               };
+
+                               macaddr_factory_f100: macaddr@f100 {
+                                       reg = <0xf100 0x6>;
+                               };
                        };
                };
        };
@@ -139,23 +150,11 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x20000>;
-
-       nvmem-cells = <&macaddr_factory_f100>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_f100>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &ethernet {
        nvmem-cells = <&macaddr_factory_f100>;
        nvmem-cell-names = "mac-address";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_f100: macaddr@f100 {
-               reg = <0xf100 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
index 01a1a7f09e288fef8431d1a21decc846a3ef7590..e5bb9f233bd4cba6900cc0f3d5bbea69ca7ab47d 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr840n-v5.dts
@@ -70,9 +70,20 @@
                        };
 
                        factory: partition@3f0000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x3f0000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_f100: macaddr@f100 {
+                                       reg = <0xf100 0x6>;
+                               };
                        };
                };
        };
@@ -89,10 +100,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-
-       nvmem-cells = <&macaddr_factory_f100>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_f100>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &ethernet {
@@ -110,13 +119,3 @@
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_f100: macaddr@f100 {
-               reg = <0xf100 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
index ff2c8d48d152742d5b265c4bc0a7a416638fae57..67df5c0127c8a4ab27f53f5e502795cc17bfe2a6 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
@@ -81,9 +81,20 @@
                        };
 
                        factory: partition@3f0000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x3f0000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_f100: macaddr@f100 {
+                                       reg = <0xf100 0x6>;
+                               };
                        };
                };
        };
@@ -100,10 +111,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-
-       nvmem-cells = <&macaddr_factory_f100>;
-       nvmem-cell-names = "mac-address";
+       nvmem-cells = <&eeprom_factory_0>, <&macaddr_factory_f100>;
+       nvmem-cell-names = "eeprom", "mac-address";
 };
 
 &ethernet {
@@ -129,13 +138,3 @@
                output-high;
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_f100: macaddr@f100 {
-               reg = <0xf100 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_unielec_u7628-01-16m.dts b/target/linux/ramips/dts/mt7628an_unielec_u7628-01-16m.dts
index 8037b3a304aff21b547188e6f35d43ad104ac7d7..2bc6a5f8c391a0b572b862b7b8df4e66cb572e96 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_unielec_u7628-01-16m.dts
+++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01-16m.dts
@@ -38,9 +38,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -56,13 +67,3 @@
        nvmem-cells = <&macaddr_factory_28>;
        nvmem-cell-names = "mac-address";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi
index f25e28abd818654c93e03b3ad2c66cef5583572b..b31ffba80907814a6ffe94fb1b0d28dfb20be44a 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi
+++ b/target/linux/ramips/dts/mt7628an_unielec_u7628-01.dtsi
@@ -88,7 +88,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &state_default {

diff --git a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
index 9100e0225e8d3cb3a8c841edee17254f9d3e0b31..27d6d67ed41ff7f7471c7fc462905885bd89a2ca 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_vocore_vocore2.dtsi
@@ -40,9 +40,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        firmware: partition@50000 {
@@ -64,7 +75,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -96,13 +108,3 @@
 &uart2 {
        status = "okay";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn531a3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn531a3.dts
index 2a09ce6f38584aef1d09f52496d8cb5723616c37..7a60906a566b1576dd5a45e882a2017c8afdfa46 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn531a3.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn531a3.dts
@@ -108,9 +108,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -125,7 +136,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -136,13 +148,3 @@
 &esw {
        mediatek,portmap = <0x2f>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts
index dcba4b64e28297e724db8730341a5617f5f37633..23f81619ee184527fbde3d4e1a9dcabdeb4c5ade 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn570ha1.dts
@@ -98,9 +98,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_2e: macaddr@2e {
+                                       reg = <0x2e 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -115,7 +126,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -126,13 +138,3 @@
 &esw {
        mediatek,portmap = <0x2f>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_2e: macaddr@2e {
-               reg = <0x2e 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts
index 83e269b3660ab4bd616afac96f1b9a819b88f1ec..65f6f47b96ffc0662915660ce4ae961c3db77038 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn575a3.dts
@@ -93,9 +93,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -110,7 +121,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -121,13 +133,3 @@
 &esw {
        mediatek,portmap = <0x2f>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn576a2.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn576a2.dts
index bb1ddd0040be505f9e8d7d7d976c311ac676d616..9ea2a3a65ff81530d1b5480bebd9469b73be7553 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn576a2.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn576a2.dts
@@ -132,9 +132,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -149,7 +160,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -172,13 +184,3 @@
 &ohci {
        status = "disabled";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts
index b4e6905624a56b75e15d0d8e33ed51c8c7c495c4..456b3ad1511be511e521bf0b3180589189640cc2 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn577a2.dts
@@ -97,9 +97,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -114,7 +125,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -137,13 +149,3 @@
 &ohci {
        status = "disabled";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn578a2.dts b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn578a2.dts
index 1d5c99da31867520182e3cda31cf2b0ee1f6f8c5..267001d950aee6959c9955320d3cca1f2dc26376 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wavlink_wl-wn578a2.dts
+++ b/target/linux/ramips/dts/mt7628an_wavlink_wl-wn578a2.dts
@@ -127,9 +127,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -144,7 +155,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -167,13 +179,3 @@
 &ohci {
        status = "disabled";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
index fd146e926444a8fefd65af784ceb79053ca05eb7..5d37b124486ec685273dfa41067e357739c2f138 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
+++ b/target/linux/ramips/dts/mt7628an_widora_neo.dtsi
@@ -74,9 +74,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        firmware: partition@50000 {
@@ -167,15 +178,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
index 9ce585021ecc615882d98632210bb4d288645c13..04b6c56bef830f4e63362b2dad70277092d7588f 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
+++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
@@ -117,9 +117,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_2e: macaddr@2e {
+                                       reg = <0x2e 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -161,15 +172,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_2e: macaddr@2e {
-               reg = <0x2e 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi
index bb35357808e5d8f2a1459bd8121b7725d2f4ad2f..c3fcaabe2fc5038b0d1ebaf307380bbbea33b5a7 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_wrtnode_wrtnode2.dtsi
@@ -48,9 +48,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -90,15 +101,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
-};
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-ra75.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-ra75.dts
index 2dd855bf8fd0d2e8e5866e6c3223408342f8cf4b..51b99300b31e471caff2103a06b05229137215f0 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-ra75.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-ra75.dts
@@ -95,10 +95,10 @@
 };
 
 &wmac {
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
-
 &esw {
        mediatek,portmap = <0x3e>;
        mediatek,portdisable = <0x2a>;
@@ -111,22 +111,3 @@
 &ohci {
        status = "disabled";
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-       macaddr_factory_8004: macaddr@8004 {
-               reg = <0x8004 0x6>;
-       };
-};
-
-

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
index 59d269bf03eeaed7a3297b5b59177afb93d654b2..c5465386580f56b6e7edcc81503a5a40e7e250b0 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
@@ -47,9 +47,28 @@
                        };
 
                        factory: partition@30000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x30000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
+
+                               macaddr_factory_8004: macaddr@8004 {
+                                       reg = <0x8004 0x6>;
+                               };
                        };
 
                        partition@40000 {
@@ -79,5 +98,6 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts
index 863191bc4b7cfc25ab918fc7c273d60f06e1ee8a..0d647c6153ceeb7bc313e1f898cb49c587ae9ae8 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m-intl.dts
@@ -72,13 +72,3 @@
        mediatek,portmap = <0x3e>;
        mediatek,portdisable = <0x2a>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
index 5ddc7af4621e93e6e0433ade9013c8334ca63613..7ae6b18f727f5768dbc02d8760240716268d9f45 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
@@ -72,13 +72,3 @@
        mediatek,portmap = <0x3e>;
        mediatek,portdisable = <0x2a>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts
index e9bbf76e4baa28732c275f2d77ce67c004420b89..27348b3ad7d60deca9a92565c5c79359daae4d40 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts
@@ -71,13 +71,3 @@
        mediatek,portmap = <0x3d>;
        mediatek,portdisable = <0x29>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-3c.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-3c.dts
index c45f94b2f171d9419c86f966626064fc5039a875..bc7083fb1f7f7eef40fb045c0db779101c9f8be5 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-3c.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-3c.dts
@@ -74,7 +74,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -113,9 +114,20 @@
                        };
 
                        factory: partition@50000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x50000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@60000 {
@@ -144,13 +156,3 @@
                };
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
index f9adca9d71488e5ab5b1e083e362132d36539f58..c957388228eab727b20b1c5bac9447b80e6bcf14 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_miwifi-nano.dts
@@ -72,7 +72,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -105,9 +106,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_28: macaddr@28 {
+                                       reg = <0x28 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -118,13 +130,3 @@
                };
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_28: macaddr@28 {
-               reg = <0x28 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
index aca4555a40bd9e63a0b8cee1d6ff2148fbcc7229..fd233cd30bb25d11f32c83be4de7a642a4bc5698 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
+++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we1226.dts
@@ -86,9 +86,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "factory";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_2e: macaddr@2e {
+                                       reg = <0x2e 0x6>;
+                               };
                        };
 
                        partition@50000 {
@@ -103,7 +114,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &ethernet {
@@ -114,13 +126,3 @@
 &esw {
        mediatek,portmap = <0x2f>;
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_2e: macaddr@2e {
-               reg = <0x2e 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts
index c53289debf0934971c0d4a214c72ddc55e4db10b..cbe390a4de3a2466c7b96ea56ce90b70e90e5327 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts
+++ b/target/linux/ramips/dts/mt7628an_zyxel_keenetic-extra-ii.dts
@@ -121,9 +121,20 @@
                        };
 
                        factory: partition@40000 {
+                               compatible = "nvmem-cells";
                                label = "rf-eeprom";
                                reg = <0x40000 0x10000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                read-only;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x400>;
+                               };
+
+                               macaddr_factory_4: macaddr@4 {
+                                       reg = <0x4 0x6>;
+                               };
                        };
 
                        firmware1: partition@50000 {
@@ -193,7 +204,8 @@
 &wmac {
        status = "okay";
 
-       mediatek,mtd-eeprom = <&factory 0x0>;
+       nvmem-cells = <&eeprom_factory_0>;
+       nvmem-cell-names = "eeprom";
 };
 
 &pcie {
@@ -215,13 +227,3 @@
                function = "gpio";
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_4: macaddr@4 {
-               reg = <0x4 0x6>;
-       };
-};