ramips: remove redundant nvmem definitions

Due to use of a script when migrating from mtd-mac-address, a few
of the definitions are redundant in DTSI and DTS files. Remove
those.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts
index 6222efcca5235e4a0eafc547e98b70eb561ee00d..10aa0ddf6f960d2e1ac355527dc3c3362cc9ff32 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts
+++ b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts
@@ -110,13 +110,3 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pa_pins>;
 };
-
-&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/mt7620a_tplink_archer-c20-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
index 2248da5b102e0752d73d358beff7248973ea9342..e3c077cb0d5395ac2583f9a16b0c8de8ab776656 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
@@ -82,13 +82,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
-
-&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/mt7620a_tplink_archer-c20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
index ba9bf1db99adfee3ee50a3ee9eaa2d163447d479..88165c02be2acf83ccf610412d8b09322aed0f06 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
@@ -62,13 +62,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
-
-&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/mt7620a_tplink_archer-c50-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
index db92af7e371e72373e4d871ec9411f7c0d920e61..aefd951f43c5c6a9772a411578d5b37262d5ef27 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
@@ -82,13 +82,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <(-1)>;
 };
-
-&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/mt7621_asiarf_ap7621-001.dts b/target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts
index 8af4d2cc082b21ff3c528f6ef763ec6d6e99f7a6..c74fee3102c96e4a5ad151486c3050ddfac89c77 100644 (file)
--- a/target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts
+++ b/target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts
@@ -23,13 +23,3 @@
                };
        };
 };
-
-&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/mt7621_asiarf_ap7621-nv1.dts b/target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts
index 4900e8db66c4b75fc0122082cf083a51a07662b7..907b6d1470109d4d976ce2ba32e7e27a395080cc 100644 (file)
--- a/target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts
+++ b/target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts
@@ -28,13 +28,3 @@
                };
        };
 };
-
-&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/mt7621_dlink_dir-1960-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts
index 82ba8cf3f70c1ae7152e4a4af6a9141c993bb4f3..d352d27b76c50a2c35900972507b75ce3ea740d7 100644 (file)
--- a/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts
@@ -27,13 +27,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 };
-
-&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/mt7621_dlink_dir-2640-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts
index 14a79cef513c10df6e7e21ad1089295bfeaee956..127a9a3417f3ada9a3738040501d68c5a7cdc507 100644 (file)
--- a/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts
@@ -34,13 +34,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 };
-
-&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/mt7621_dlink_dir-2660-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts
index a90856c0b6449761b89136e32f34a4398e15f275..02fd35d60e92c4508e6948a417287a5af9ca5529 100644 (file)
--- a/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts
@@ -34,13 +34,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <2>;
 };
-
-&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/mt7621_ubnt_edgerouter-x-sfp.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts
index 8f97ba3353a9d7cf985c3fefcd9df7b7f817add1..897aa90ea39684fd9780469d6c290c4d17cc4afb 100644 (file)
--- a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts
+++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts
@@ -72,13 +72,3 @@
                };
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_22: macaddr@22 {
-               reg = <0x22 0x6>;
-       };
-};

diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
index 02a22b7495dbddf1732c9265c83307db87619d57..e9fc6d7090fb8df1ae72f7400afead710b79d9a2 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
@@ -48,13 +48,3 @@
        nvmem-cell-names = "mac-address";
        mac-address-increment = <(2)>;
 };
-
-&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_tplink_archer-c20-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
index c2c6e922b76d5bb682443a1c34f619caba882de8..02d0144f4aec6c23f005574b272da2915fc8315a 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
@@ -106,13 +106,3 @@
                mac-address-increment = <(-1)>;
        };
 };
-
-&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_archer-c20-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
index 4f5faf2ee0ce1269fb2b503bc96946fe68000a5a..7f5b3d557a5d2f0fcd783b9d6eb870bc0b073747 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
@@ -101,13 +101,3 @@
                mac-address-increment = <(-1)>;
        };
 };
-
-&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_archer-c50-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
index 8fc2334ae260645e44c3d34b88a8e4f5bfa5a121..ab81b094934e5cc5bd947627b448184f279d3578 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
@@ -101,13 +101,3 @@
                mac-address-increment = <(-1)>;
        };
 };
-
-&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_archer-c50-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
index 2a6963ab1cb7359f459e83cb8079e9daaf54e108..164cf7a170f7e3c554a47651ae8df0a8920ef2ae 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
@@ -99,13 +99,3 @@
                mac-address-increment = <(-1)>;
        };
 };
-
-&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_tl-wr802n-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
index 2141abc4423ac0b980bee83bcbe0bc3d9f772cc1..46c18d6b2d82a168bb4be83d98cf7879299d3c7d 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts
@@ -52,13 +52,3 @@
        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-wr902ac-v3.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
index fe10600cb9179926965d8b15dc41f93d304b798e..9be8529bbf884b4dcef954906d926084271e07cc 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
@@ -97,13 +97,3 @@
                mac-address-increment = <(-1)>;
        };
 };
-
-&factory {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_factory_f100: macaddr@f100 {
-               reg = <0xf100 0x6>;
-       };
-};