treewide: remove factory:

For the most part, factory: remains as a hold over from nvmem-layout
conversion and no longer serves any purpose.

In the case of &factory sections, reduce identation slightly by
referencing the nvmem-layout node instead.

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

diff --git a/target/linux/ipq806x/dts/qcom-ipq8062-wg2600hp3.dts b/target/linux/ipq806x/dts/qcom-ipq8062-wg2600hp3.dts
index 03f66ea4af6d9f8df5e4f1ec14d8f924d3bcb7c8..4ceb2aec2625637508bba866c33d9b46e2b1f86e 100644 (file)
--- a/target/linux/ipq806x/dts/qcom-ipq8062-wg2600hp3.dts
+++ b/target/linux/ipq806x/dts/qcom-ipq8062-wg2600hp3.dts
@@ -322,7 +322,7 @@
                                        read-only;
                                };
 
-                               factory: partition@2b0000 {
+                               partition@2b0000 {
                                        label = "PRODUCTDATA";
                                        reg = <0x02b0000 0x0030000>;
                                        read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-alwaylink-m01k43.dts b/target/linux/mediatek/dts/mt7981b-alwaylink-m01k43.dts
index 42df9fe7aa0e88e1bc92b0c61bf1b438a2c18f32..57278f911ac2bab75ee3a58ce3b2a9f680fad6e1 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-alwaylink-m01k43.dts
+++ b/target/linux/mediatek/dts/mt7981b-alwaylink-m01k43.dts
@@ -308,7 +308,7 @@
                                reg = <0x040000 0x010000>;
                        };
 
-                       factory: partition@50000 {
+                       partition@50000 {
                                label = "factory";
                                reg = <0x050000 0x0b0000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-comfast-cf-xr186.dts b/target/linux/mediatek/dts/mt7981b-comfast-cf-xr186.dts
index 1e7b2745e77c71cb276c7ac4a701a1d620495870..a2181a86779647f4bf459ee9ba02c6548dd084e9 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-comfast-cf-xr186.dts
+++ b/target/linux/mediatek/dts/mt7981b-comfast-cf-xr186.dts
@@ -147,7 +147,7 @@
                                read-only;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x0200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-livinet-li320.dts b/target/linux/mediatek/dts/mt7981b-livinet-li320.dts
index b443a06000f0c74a8f1eefee4b2145878cba61be..8ec006351ff1bd752722b661bbe3ba4761f261b8 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-livinet-li320.dts
+++ b/target/linux/mediatek/dts/mt7981b-livinet-li320.dts
@@ -186,7 +186,7 @@
                                reg = <0x100000 0x80000>;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7981b-netis-eap930-v1.dts b/target/linux/mediatek/dts/mt7981b-netis-eap930-v1.dts
index de141f01c866460b5bf67c263f7044da91cfe472..13622d99e909bea8137faeb883eeb5b2a494cc16 100644 (file)
--- a/target/linux/mediatek/dts/mt7981b-netis-eap930-v1.dts
+++ b/target/linux/mediatek/dts/mt7981b-netis-eap930-v1.dts
@@ -120,10 +120,26 @@
                                read-only;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x200000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
+                                       macaddr_factory_1fef20: macaddr@1fef20 {
+                                               compatible = "mac-base";
+                                               reg = <0x1fef20 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@380000 {
@@ -155,24 +171,6 @@
        };
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               eeprom_factory_0: eeprom@0 {
-                       reg = <0x0 0x1000>;
-               };
-
-               macaddr_factory_1fef20: macaddr@1fef20 {
-                       compatible = "mac-base";
-                       reg = <0x1fef20 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
-       };
-};
-
 &pio {
        spi0_flash_pins: spi0-pins {
                mux {

diff --git a/target/linux/mediatek/dts/mt7986a-jiorouter-common.dtsi b/target/linux/mediatek/dts/mt7986a-jiorouter-common.dtsi
index b7135917b9ff90bb348488ca163e93e6d4a52139..660a7e423c1f971d170d732d893725b9b7d18a42 100644 (file)
--- a/target/linux/mediatek/dts/mt7986a-jiorouter-common.dtsi
+++ b/target/linux/mediatek/dts/mt7986a-jiorouter-common.dtsi
@@ -204,7 +204,7 @@
                                read-only;
                        };
 
-                       factory: partition@180000 {
+                       partition@180000 {
                                label = "Factory";
                                reg = <0x180000 0x200000>;
                                read-only;

diff --git a/target/linux/mediatek/dts/mt7988a-zbtlink-zbt-z8803be.dts b/target/linux/mediatek/dts/mt7988a-zbtlink-zbt-z8803be.dts
index ce38f61187027aa0ac6061e8ca295589cbdebf30..8a1f4107dd756751916ccd29b6fcbd782a4cd3bd 100644 (file)
--- a/target/linux/mediatek/dts/mt7988a-zbtlink-zbt-z8803be.dts
+++ b/target/linux/mediatek/dts/mt7988a-zbtlink-zbt-z8803be.dts
@@ -370,9 +370,10 @@
                        reg = <0x100000 0x80000>;
                };
 
-               factory: partition@180000 {
+               partition@180000 {
                        label = "Factory";
                        reg = <0x180000 0x400000>;
+
                        nvmem-layout {
                                compatible = "fixed-layout";
                                #address-cells = <1>;

diff --git a/target/linux/ramips/dts/mt7620a_wavlink_wl-wn531g3-a2.dts b/target/linux/ramips/dts/mt7620a_wavlink_wl-wn531g3-a2.dts
index af9fd40547ea4149ec537b3a2b745dd70931fbd2..e34b6296122ddb8560d3f0c6fc7aa98efe551b1a 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_wavlink_wl-wn531g3-a2.dts
+++ b/target/linux/ramips/dts/mt7620a_wavlink_wl-wn531g3-a2.dts
@@ -94,7 +94,7 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;

diff --git a/target/linux/ramips/dts/mt7620a_wavlink_wl-wn531g3.dts b/target/linux/ramips/dts/mt7620a_wavlink_wl-wn531g3.dts
index fbe95d17f5c449b770601c3826fde8650cb571f8..b4cb3099b60db6c1d7813ea4ac24795efc80f623 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_wavlink_wl-wn531g3.dts
+++ b/target/linux/ramips/dts/mt7620a_wavlink_wl-wn531g3.dts
@@ -94,7 +94,7 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;

diff --git a/target/linux/ramips/dts/mt7621_comfast_cf-ew72-v2.dts b/target/linux/ramips/dts/mt7621_comfast_cf-ew72-v2.dts
index f39f79ee87fd36b50cf48f7f9705f5d714c09743..a73dd26c06192cfa4837fa7e8c4813ae69991a8a 100644 (file)
--- a/target/linux/ramips/dts/mt7621_comfast_cf-ew72-v2.dts
+++ b/target/linux/ramips/dts/mt7621_comfast_cf-ew72-v2.dts
@@ -164,8 +164,6 @@
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&eeprom_factory_0>;
                nvmem-cell-names = "eeprom";
-               // Wi-Fi device reads it's MAC address from EEPROM (&factory + 4)
-               // adding anything related to mac-address here will cause use random MAC
        };
 };
 
@@ -175,8 +173,6 @@
                reg = <0x0000 0 0 0 0>;
                nvmem-cells = <&eeprom_factory_8000>;
                nvmem-cell-names = "eeprom";
-               // Wi-Fi device reads it's MAC address from EEPROM, (&factory + 0x8000 + 4)
-               // adding anything related to mac-address here will cause use random MAC.
        };
 };
 

diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-1360-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-1360-a1.dts
index e6011c5b5f935e6caff5e0e88b7ef5e0ca109ab4..f0d5fdffab79c3ee8bdf281ca998fe7191f87057 100644 (file)
--- a/target/linux/ramips/dts/mt7621_dlink_dir-1360-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-1360-a1.dts
@@ -110,7 +110,7 @@
                        read-only;
                };
 
-               factory: partition@100000 {
+               partition@100000 {
                        label = "factory";
                        reg = <0x100000 0x40000>;
                        read-only;

diff --git a/target/linux/ramips/dts/mt7621_elecom_wmc-c2533gst.dts b/target/linux/ramips/dts/mt7621_elecom_wmc-c2533gst.dts
index a86e4f3b4f97dde35efb944da83e1fff3057cb59..0730405aa91794877f06169f1a164828c0eee143 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wmc-c2533gst.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wmc-c2533gst.dts
@@ -49,18 +49,12 @@
        nvmem-cell-names = "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_fff4: macaddr@fff4 {
-                       reg = <0xfff4 0x6>;
-               };
+&nvmem {
+       macaddr_factory_fff4: macaddr@fff4 {
+               reg = <0xfff4 0x6>;
+       };
 
-               macaddr_factory_fffa: macaddr@fffa {
-                       reg = <0xfffa 0x6>;
-               };
+       macaddr_factory_fffa: macaddr@fffa {
+               reg = <0xfffa 0x6>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wmc-m1267gst2.dts b/target/linux/ramips/dts/mt7621_elecom_wmc-m1267gst2.dts
index b75c6fcde1a6f9dc4187ccb715d2cb0b08346ad8..e57577afbeb003a70ad15b239f4b0caddec5f9a8 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wmc-m1267gst2.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wmc-m1267gst2.dts
@@ -54,24 +54,18 @@
        nvmem-cell-names = "eeprom", "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_4: macaddr@4 {
-                       compatible = "mac-base";
-                       reg = <0x4 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
+&nvmem {
+       macaddr_factory_4: macaddr@4 {
+               compatible = "mac-base";
+               reg = <0x4 0x6>;
+               #nvmem-cell-cells = <1>;
+       };
 
-               macaddr_factory_fff4: macaddr@fff4 {
-                       reg = <0xfff4 0x6>;
-               };
+       macaddr_factory_fff4: macaddr@fff4 {
+               reg = <0xfff4 0x6>;
+       };
 
-               macaddr_factory_fffa: macaddr@fffa {
-                       reg = <0xfffa 0x6>;
-               };
+       macaddr_factory_fffa: macaddr@fffa {
+               reg = <0xfffa 0x6>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wmc-s1267gs2.dts b/target/linux/ramips/dts/mt7621_elecom_wmc-s1267gs2.dts
index e4ad8bf975ebe22dc1e49749b36441cd699d071f..5199451ad4f8fdb676705b52366c6c86c6b41218 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wmc-s1267gs2.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wmc-s1267gs2.dts
@@ -63,20 +63,14 @@
        nvmem-cell-names = "eeprom", "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_4: macaddr@4 {
-                       compatible = "mac-base";
-                       reg = <0x4 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
+&nvmem {
+       macaddr_factory_4: macaddr@4 {
+               compatible = "mac-base";
+               reg = <0x4 0x6>;
+               #nvmem-cell-cells = <1>;
+       };
 
-               macaddr_factory_fff4: macaddr@fff4 {
-                       reg = <0xfff4 0x6>;
-               };
+       macaddr_factory_fff4: macaddr@fff4 {
+               reg = <0xfff4 0x6>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1167gs2-b.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1167gs2-b.dts
index 6af993832afb17c8fbbb41fce59745af5deb426a..32f026b67ed93ce53f67c0351d15a9a3fb3fbcf7 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167gs2-b.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167gs2-b.dts
@@ -54,24 +54,18 @@
        nvmem-cell-names = "eeprom", "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_4: macaddr@4 {
-                       compatible = "mac-base";
-                       reg = <0x4 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
+&nvmem {
+       macaddr_factory_4: macaddr@4 {
+               compatible = "mac-base";
+               reg = <0x4 0x6>;
+               #nvmem-cell-cells = <1>;
+       };
 
-               macaddr_factory_fff4: macaddr@fff4 {
-                       reg = <0xfff4 0x6>;
-               };
+       macaddr_factory_fff4: macaddr@fff4 {
+               reg = <0xfff4 0x6>;
+       };
 
-               macaddr_factory_fffa: macaddr@fffa {
-                       reg = <0xfffa 0x6>;
-               };
+       macaddr_factory_fffa: macaddr@fffa {
+               reg = <0xfffa 0x6>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts
index 9ed2de2ed934b3b1a6cc82d78b110237408e879b..6475e2dc47cbd2e59bcca2abfcae1c41503df96d 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts
@@ -54,20 +54,14 @@
        nvmem-cell-names = "eeprom", "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_e000: macaddr@e000 {
-                       reg = <0xe000 0x6>;
-               };
+&nvmem {
+       macaddr_factory_e000: macaddr@e000 {
+               reg = <0xe000 0x6>;
+       };
 
-               macaddr_factory_e006: macaddr@e006 {
-                       compatible = "mac-base";
-                       reg = <0xe006 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
+       macaddr_factory_e006: macaddr@e006 {
+               compatible = "mac-base";
+               reg = <0xe006 0x6>;
+               #nvmem-cell-cells = <1>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts
index c01533fafdd0c555e4005ddfa2d8d4b2afdea4c7..0a374192358b244aade5417e616b168294ce8fc4 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts
@@ -49,18 +49,12 @@
        nvmem-cell-names = "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_e000: macaddr@e000 {
-                       reg = <0xe000 0x6>;
-               };
+&nvmem {
+       macaddr_factory_e000: macaddr@e000 {
+               reg = <0xe000 0x6>;
+       };
 
-               macaddr_factory_e006: macaddr@e006 {
-                       reg = <0xe006 0x6>;
-               };
+       macaddr_factory_e006: macaddr@e006 {
+               reg = <0xe006 0x6>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1750gst2.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1750gst2.dts
index 4157fb6c1351cd735ecfeccc113a2a78e771a87c..48cb28ce0da3aa2ac433311027590a4840d25df9 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1750gst2.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1750gst2.dts
@@ -49,18 +49,12 @@
        nvmem-cell-names = "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_e000: macaddr@e000 {
-                       reg = <0xe000 0x6>;
-               };
+&nvmem {
+       macaddr_factory_e000: macaddr@e000 {
+               reg = <0xe000 0x6>;
+       };
 
-               macaddr_factory_e006: macaddr@e006 {
-                       reg = <0xe006 0x6>;
-               };
+       macaddr_factory_e006: macaddr@e006 {
+               reg = <0xe006 0x6>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts
index d978ff8238840d98cbc25b2b8330438064e417b6..bd63965cfeaad85b404ada496bf9dd5c6aca9ab2 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts
@@ -49,18 +49,12 @@
        nvmem-cell-names = "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_e000: macaddr@e000 {
-                       reg = <0xe000 0x6>;
-               };
+&nvmem {
+       macaddr_factory_e000: macaddr@e000 {
+               reg = <0xe000 0x6>;
+       };
 
-               macaddr_factory_e006: macaddr@e006 {
-                       reg = <0xe006 0x6>;
-               };
+       macaddr_factory_e006: macaddr@e006 {
+               reg = <0xe006 0x6>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts
index 5e3b47e2746d3ea5471fed92a690ecb2a8d8d561..350662d52789d49a49927ec91280b2f4f078ff59 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts
@@ -49,18 +49,12 @@
        nvmem-cell-names = "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_e000: macaddr@e000 {
-                       reg = <0xe000 0x6>;
-               };
+&nvmem {
+       macaddr_factory_e000: macaddr@e000 {
+               reg = <0xe000 0x6>;
+       };
 
-               macaddr_factory_e006: macaddr@e006 {
-                       reg = <0xe006 0x6>;
-               };
+       macaddr_factory_e006: macaddr@e006 {
+               reg = <0xe006 0x6>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-2533gs2.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-2533gs2.dts
index 77fcb8c4298b2dc0a257655c298ab4b522aaf73c..76df69cec5decc4e0997b74cc295dbde6263b627 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-2533gs2.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-2533gs2.dts
@@ -49,18 +49,12 @@
        nvmem-cell-names = "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_fff4: macaddr@fff4 {
-                       reg = <0xfff4 0x6>;
-               };
+&nvmem {
+       macaddr_factory_fff4: macaddr@fff4 {
+               reg = <0xfff4 0x6>;
+       };
 
-               macaddr_factory_fffa: macaddr@fffa {
-                       reg = <0xfffa 0x6>;
-               };
+       macaddr_factory_fffa: macaddr@fffa {
+               reg = <0xfffa 0x6>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts
index 481734a51c1b741a81d5a35a82453c49f46c7a9c..9a3d9126e21e0e490d06d9734505e8d8ed1ab109 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts
@@ -47,18 +47,12 @@
        nvmem-cell-names = "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_e000: macaddr@e000 {
-                       reg = <0xe000 0x6>;
-               };
+&nvmem {
+       macaddr_factory_e000: macaddr@e000 {
+               reg = <0xe000 0x6>;
+       };
 
-               macaddr_factory_e006: macaddr@e006 {
-                       reg = <0xe006 0x6>;
-               };
+       macaddr_factory_e006: macaddr@e006 {
+               reg = <0xe006 0x6>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst2.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst2.dts
index e7c06ff359dcfe332381d77b3f9cdfffa665178c..a22b641c95d473b01525987092924abd091d41f3 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst2.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst2.dts
@@ -49,18 +49,12 @@
        nvmem-cell-names = "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_e000: macaddr@e000 {
-                       reg = <0xe000 0x6>;
-               };
+&nvmem {
+       macaddr_factory_e000: macaddr@e000 {
+               reg = <0xe000 0x6>;
+       };
 
-               macaddr_factory_e006: macaddr@e006 {
-                       reg = <0xe006 0x6>;
-               };
+       macaddr_factory_e006: macaddr@e006 {
+               reg = <0xe006 0x6>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi b/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi
index 9b2f313e9f02a6a7dfcd4e497660de46739561d5..dfb44b32fadc508375a9ed45ee81985650d72de0 100644 (file)
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi
@@ -147,12 +147,12 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
 
-                               nvmem-layout {
+                               nvmem: nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
                                        #size-cells = <1>;

diff --git a/target/linux/ramips/dts/mt7621_zyxel_lte7490-m904.dts b/target/linux/ramips/dts/mt7621_zyxel_lte7490-m904.dts
index f12e92682f2ec278fd6e654a5f76bb66382345e3..ed314a0bde08480419fe525692362fe2cb0d2aa8 100644 (file)
--- a/target/linux/ramips/dts/mt7621_zyxel_lte7490-m904.dts
+++ b/target/linux/ramips/dts/mt7621_zyxel_lte7490-m904.dts
@@ -92,7 +92,7 @@
                        reg = <0x80000 0x80000>;
                };
 
-               factory: partition@100000 {
+               partition@100000 {
                        label = "Factory";
                        reg = <0x100000 0x40000>;
                        read-only;

diff --git a/target/linux/ramips/dts/mt7628an_creality_wb-01.dts b/target/linux/ramips/dts/mt7628an_creality_wb-01.dts
index 821cd66fbf48e5fef2b9b77dae13e04404004af4..6cfe78d33e71346f164a02d50ac898fe858a32ce 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_creality_wb-01.dts
+++ b/target/linux/ramips/dts/mt7628an_creality_wb-01.dts
@@ -83,7 +83,7 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;

diff --git a/target/linux/ramips/dts/mt7628an_tplink_16m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_16m.dtsi
index 6d3ad0ddd02f7cb53211f1a1041818b1432884e4..0c69f3844c1b0ffbdcf6588a475bcb5504928da2 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_16m.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_16m.dtsi
@@ -46,12 +46,12 @@
                                read-only;
                        };
 
-                       factory: partition@fd0000 {
+                       partition@fd0000 {
                                label = "factory";
                                reg = <0xfd0000 0x30000>;
                                read-only;
 
-                               nvmem-layout {
+                               nvmem: nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
                                        #size-cells = <1>;

diff --git a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
index 4956c12d9c841a5e1676674c56945d7d10a920c8..08211ac360e3430ff391af29261ba80f050a12e3 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_8m.dtsi
@@ -44,12 +44,12 @@
                                read-only;
                        };
 
-                       factory: partition@7d0000 {
+                       partition@7d0000 {
                                label = "factory";
                                reg = <0x7d0000 0x30000>;
                                read-only;
 
-                               nvmem-layout {
+                               nvmem: nvmem-layout {
                                        compatible = "fixed-layout";
                                        #address-cells = <1>;
                                        #size-cells = <1>;

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts
index 67cc54650f210bde2519939ce7d34f999117a9fc..4cd037e1fbef7879a9f6f875afc0120d48a8a84c 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts
@@ -100,16 +100,10 @@
        nvmem-cell-names = "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_1f100: macaddr@1f100 {
-                       compatible = "mac-base";
-                       reg = <0x1f100 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
+&nvmem {
+       macaddr_factory_1f100: macaddr@1f100 {
+               compatible = "mac-base";
+               reg = <0x1f100 0x6>;
+               #nvmem-cell-cells = <1>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts
index 609452dfe17aad28fbc7d05184cf9d73f5c47d3a..03829fd4994dd5ab0df6b59ed2b6e1010f98a956 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts
@@ -100,16 +100,10 @@
        nvmem-cell-names = "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_1f100: macaddr@1f100 {
-                       compatible = "mac-base";
-                       reg = <0x1f100 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
+&nvmem {
+       macaddr_factory_1f100: macaddr@1f100 {
+               compatible = "mac-base";
+               reg = <0x1f100 0x6>;
+               #nvmem-cell-cells = <1>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v7.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v7.dts
index 349d29c42c0ef481c412da3175ff1f85b3ce4e68..5a56cd5412ab5b76050b8cbf7165389920c396d7 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v7.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v7.dts
@@ -100,16 +100,10 @@
        nvmem-cell-names = "mac-address";
 };
 
-&factory {
-       nvmem-layout {
-               compatible = "fixed-layout";
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               macaddr_factory_1f100: macaddr@1f100 {
-                       compatible = "mac-base";
-                       reg = <0x1f100 0x6>;
-                       #nvmem-cell-cells = <1>;
-               };
+&nvmem {
+       macaddr_factory_1f100: macaddr@1f100 {
+               compatible = "mac-base";
+               reg = <0x1f100 0x6>;
+               #nvmem-cell-cells = <1>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we2426-b.dts b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we2426-b.dts
index 6dfdb2617c36b2adfc14c4128de09ae4ca4680c2..f9a3e7107653b38511ad07b6afe6990ac1509fbc 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we2426-b.dts
+++ b/target/linux/ramips/dts/mt7628an_zbtlink_zbt-we2426-b.dts
@@ -100,7 +100,7 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;

diff --git a/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2-nand.dts b/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2-nand.dts
index 67fa01074e12a2378f9bdf7c79efc0d04a0e7737..c6ad86a5c6343f180243a7084ac5362fd7bbed09 100644 (file)
--- a/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2-nand.dts
+++ b/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2-nand.dts
@@ -34,7 +34,7 @@
                                compatible = "linux,ubi";
 
                                volumes {
-                                       factory: ubi-volume-factory {
+                                       ubi-volume-factory {
                                                volname = "factory";
 
                                                nvmem-layout {

diff --git a/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2-nor.dts b/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2-nor.dts
index 761e13e7dfd30e10a0bbeabd8661b87edfb2fa67..4d591270abf51e9215bdcfe49e40416da9cd28fb 100644 (file)
--- a/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2-nor.dts
+++ b/target/linux/siflower/dts/sf21h8898_bananapi_bpi-rv2-nor.dts
@@ -29,7 +29,7 @@
                                read-only;
                        };
 
-                       factory: partition@90000 {
+                       partition@90000 {
                                label = "factory";
                                reg = <0x90000 0x10000>;