From: Rosen Penev Date: Tue, 30 Jun 2026 04:03:14 +0000 (-0700) Subject: treewide: remove factory: X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F24008%2Fhead;p=thirdparty%2Fopenwrt.git 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 Link: https://github.com/openwrt/openwrt/pull/24008 Signed-off-by: Jonas Jelonek --- diff --git a/target/linux/ipq806x/dts/qcom-ipq8062-wg2600hp3.dts b/target/linux/ipq806x/dts/qcom-ipq8062-wg2600hp3.dts index 03f66ea4af6..4ceb2aec262 100644 --- 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 42df9fe7aa0..57278f911ac 100644 --- 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 1e7b2745e77..a2181a86779 100644 --- 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 b443a06000f..8ec006351ff 100644 --- 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 de141f01c86..13622d99e90 100644 --- 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 b7135917b9f..660a7e423c1 100644 --- 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 ce38f611870..8a1f4107dd7 100644 --- 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 af9fd40547e..e34b6296122 100644 --- 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 fbe95d17f5c..b4cb3099b60 100644 --- 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 f39f79ee87f..a73dd26c061 100644 --- 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 e6011c5b5f9..f0d5fdffab7 100644 --- 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 a86e4f3b4f9..0730405aa91 100644 --- 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 b75c6fcde1a..e57577afbeb 100644 --- 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 e4ad8bf975e..5199451ad4f 100644 --- 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 6af993832af..32f026b67ed 100644 --- 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 9ed2de2ed93..6475e2dc47c 100644 --- 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 c01533fafdd..0a374192358 100644 --- 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 4157fb6c135..48cb28ce0da 100644 --- 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 d978ff82388..bd63965cfea 100644 --- 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 5e3b47e2746..350662d5278 100644 --- 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 77fcb8c4298..76df69cec5d 100644 --- 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 481734a51c1..9a3d9126e21 100644 --- 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 e7c06ff359d..a22b641c95d 100644 --- 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 9b2f313e9f0..dfb44b32fad 100644 --- 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 f12e92682f2..ed314a0bde0 100644 --- 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 821cd66fbf4..6cfe78d33e7 100644 --- 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 6d3ad0ddd02..0c69f3844c1 100644 --- 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 4956c12d9c8..08211ac360e 100644 --- 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 67cc54650f2..4cd037e1fbe 100644 --- 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 609452dfe17..03829fd4994 100644 --- 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 349d29c42c0..5a56cd5412a 100644 --- 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 6dfdb2617c3..f9a3e710765 100644 --- 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 67fa01074e1..c6ad86a5c63 100644 --- 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 761e13e7dfd..4d591270abf 100644 --- 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>;