[openwrt/openwrt] ramips: remove redundant nvmem definitions

LEDE Commits lede-commits at lists.infradead.org
Fri Aug 20 09:14:15 PDT 2021


adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f13c7a56f0352b001e9495fb64fc4e7cfa268d31

commit f13c7a56f0352b001e9495fb64fc4e7cfa268d31
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Thu Aug 19 01:50:27 2021 +0200

    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 at adrianschmutzler.de>
---
 target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts         | 10 ----------
 target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts  | 10 ----------
 target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts    | 10 ----------
 target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts  | 10 ----------
 target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts      | 10 ----------
 target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts      | 10 ----------
 target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts      | 10 ----------
 target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts      | 10 ----------
 target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts      | 10 ----------
 target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts  | 10 ----------
 target/linux/ramips/dts/mt7628an_netgear_r6120.dts        | 10 ----------
 target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts | 10 ----------
 target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts | 10 ----------
 target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts | 10 ----------
 target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts | 10 ----------
 target/linux/ramips/dts/mt7628an_tplink_tl-wr802n-v4.dts  | 10 ----------
 target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts | 10 ----------
 17 files changed, 170 deletions(-)

diff --git a/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts b/target/linux/ramips/dts/mt7620a_hiwifi_hc5861.dts
index 6222efcca5..10aa0ddf6f 100644
--- 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 at 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 2248da5b10..e3c077cb0d 100644
--- 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 at 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 ba9bf1db99..88165c02be 100644
--- 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 at 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 db92af7e37..aefd951f43 100644
--- 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 at 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 8af4d2cc08..c74fee3102 100644
--- 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 at 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 4900e8db66..907b6d1470 100644
--- 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 at 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 82ba8cf3f7..d352d27b76 100644
--- 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 at 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 14a79cef51..127a9a3417 100644
--- 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 at 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 a90856c0b6..02fd35d60e 100644
--- 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 at 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 8f97ba3353..897aa90ea3 100644
--- 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 at 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 02a22b7495..e9fc6d7090 100644
--- 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 at 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 c2c6e922b7..02d0144f4a 100644
--- 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 at 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 4f5faf2ee0..7f5b3d557a 100644
--- 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 at 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 8fc2334ae2..ab81b09493 100644
--- 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 at 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 2a6963ab1c..164cf7a170 100644
--- 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 at 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 2141abc442..46c18d6b2d 100644
--- 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 at 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 fe10600cb9..9be8529bbf 100644
--- 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 at f100 {
-		reg = <0xf100 0x6>;
-	};
-};



More information about the lede-commits mailing list