treewide: convert mtd-mac-address-increment* to generic implementation

Rework patch 681-NET-add-mtd-mac-address-support to implement
only the function to read the mac-address from mtd.
Generalize mtd-mac-address-increment function so it can be applied
to any source of of_get_mac_address.
Rename any mtd-mac-address-increment to mac-address-increment.
Rename any mtd-mac-address-increment-byte to mac-address-increment-byte.

This should make simplify the conversion of target to nvmem implementation.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

60 files changed, 74 insertions, 74 deletions

diff --git a/target/linux/ramips/dts/mt7620a_cameo_810.dtsi b/target/linux/ramips/dts/mt7620a_cameo_810.dtsi
index 70407449db6..b1a50bb7116 100644
--- a/target/linux/ramips/dts/mt7620a_cameo_810.dtsi
+++ b/target/linux/ramips/dts/mt7620a_cameo_810.dtsi
@@ -154,6 +154,6 @@
 		mediatek,mtd-eeprom = <&factory 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 		mtd-mac-address = <&factory 0x28>;
-		mtd-mac-address-increment = <2>;
+		mac-address-increment = <2>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
index 774d90c79d4..5b8d883dd59 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dir-510l.dts
@@ -115,7 +115,7 @@
 	mt76x0e@0,0 {
 		reg = <0x0000 0 0 0 0>;
 		mtd-mac-address = <&config 0xe490>;
-		mtd-mac-address-increment = <(2)>;
+		mac-address-increment = <(2)>;
 		mediatek,mtd-eeprom = <&config 0xe05d>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts
index b86ab1449b6..2e755b66205 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a1.dts
@@ -143,7 +143,7 @@
 	wifi@0,0 {
 		reg = <0x0000 0 0 0 0>;
 		mtd-mac-address = <&config 0xe496>;
-		mtd-mac-address-increment = <(2)>;
+		mac-address-increment = <(2)>;
 		mediatek,mtd-eeprom = <&config 0xe083>;
 
 		led {
diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts
index b0dd31cafcd..eec4969ff37 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-118-a2.dts
@@ -141,7 +141,7 @@
 		reg = <0x0000 0 0 0 0>;
 		ieee80211-freq-limit = <5000000 6000000>;
 		mtd-mac-address = <&config 0xe4a8>;
-		mtd-mac-address-increment = <(2)>;
+		mac-address-increment = <(2)>;
 
 		led {
 			led-sources = <2>;
diff --git a/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts b/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts
index 4284c61aa2e..eed57f7f684 100644
--- a/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dwr-960.dts
@@ -176,7 +176,7 @@
 		ieee80211-freq-limit = <5000000 6000000>;
 		mediatek,mtd-eeprom = <&config 0xe08e>;
 		mtd-mac-address = <&config 0xe50e>;
-		mtd-mac-address-increment = <2>;
+		mac-address-increment = <2>;
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts
index 41d69d009b0..2f882b3b504 100644
--- a/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts
+++ b/target/linux/ramips/dts/mt7620a_lava_lr-25g001.dts
@@ -141,7 +141,7 @@
 	mt76x0e@0,0 {
 		reg = <0x0000 0 0 0 0>;
 		mtd-mac-address = <&config 0xe07e>;
-		mtd-mac-address-increment = <(2)>;
+		mac-address-increment = <(2)>;
 		mediatek,mtd-eeprom = <&config 0xe08a>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
index 184af58d292..cfd55ea2218 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
@@ -184,6 +184,6 @@
 		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&radio 0x8000>;
 		mtd-mac-address = <&rom 0xf100>;
-		mtd-mac-address-increment = <(-1)>;
+		mac-address-increment = <(-1)>;
 	};
 };
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 f7e7d50df7c..89f48dc7d31 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20-v1.dts
@@ -73,10 +73,10 @@
 	pinctrl-0 = <&pa_pins>;
 
 	mtd-mac-address = <&rom 0xf100>;
-	mtd-mac-address-increment = <(-2)>;
+	mac-address-increment = <(-2)>;
 };
 
 &wifi {
 	mtd-mac-address = <&rom 0xf100>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
index a6c3cea7360..c4fb98c4676 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c20i.dts
@@ -58,5 +58,5 @@
 
 &wifi {
 	mtd-mac-address = <&rom 0xf100>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
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 d564552ff0b..8de87caecc0 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c50-v1.dts
@@ -73,10 +73,10 @@
 	pinctrl-0 = <&pa_pins>;
 
 	mtd-mac-address = <&rom 0xf100>;
-	mtd-mac-address-increment = <(-2)>;
+	mac-address-increment = <(-2)>;
 };
 
 &wifi {
 	mtd-mac-address = <&rom 0xf100>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
diff --git a/target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi b/target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi
index 80b47b7d774..7b3025e8b48 100644
--- a/target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi
+++ b/target/linux/ramips/dts/mt7620a_tplink_re2x0-v1.dtsi
@@ -89,7 +89,7 @@
 		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&radio 0x8000>;
 		mtd-mac-address = <&uboot 0x1fc00>;
-		mtd-mac-address-increment = <2>;
+		mac-address-increment = <2>;
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_adslr_g7.dts b/target/linux/ramips/dts/mt7621_adslr_g7.dts
index 3290a5e710c..84c0d3b2828 100644
--- a/target/linux/ramips/dts/mt7621_adslr_g7.dts
+++ b/target/linux/ramips/dts/mt7621_adslr_g7.dts
@@ -130,7 +130,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe00c>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts
index ed9e9852d3f..0a4971d06c8 100644
--- a/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts
+++ b/target/linux/ramips/dts/mt7621_afoundry_ew1200.dts
@@ -135,7 +135,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts b/target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts
index cf91dc03119..0e66057fa59 100644
--- a/target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts
+++ b/target/linux/ramips/dts/mt7621_asiarf_ap7621-001.dts
@@ -18,7 +18,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts b/target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts
index 5a4c03fb7c0..4088b8137dc 100644
--- a/target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts
+++ b/target/linux/ramips/dts/mt7621_asiarf_ap7621-nv1.dts
@@ -13,7 +13,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 
 		port@2 {
diff --git a/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts b/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts
index 048eac5a3dd..9244c8368b3 100644
--- a/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts
+++ b/target/linux/ramips/dts/mt7621_buffalo_wsr-2533dhpl.dts
@@ -165,7 +165,7 @@
 
 &gmac0 {
 	mtd-mac-address = <&factory 0x4>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &switch0 {
diff --git a/target/linux/ramips/dts/mt7621_cudy_wr1300.dts b/target/linux/ramips/dts/mt7621_cudy_wr1300.dts
index a66ce942a57..e943c040695 100644
--- a/target/linux/ramips/dts/mt7621_cudy_wr1300.dts
+++ b/target/linux/ramips/dts/mt7621_cudy_wr1300.dts
@@ -142,7 +142,7 @@
 		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&factory 0x8000>;
 		mtd-mac-address = <&bdinfo 0xde00>;
-		mtd-mac-address-increment = <2>;
+		mac-address-increment = <2>;
 		ieee80211-freq-limit = <5000000 6000000>;
 
 		led {
@@ -182,7 +182,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&bdinfo 0xde00>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
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 0f4fbc1873a..fd11768ce64 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-1960-a1.dts
@@ -18,10 +18,10 @@
 
 &wifi0 {
 	mtd-mac-address = <&factory 0xe000>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &wifi1 {
 	mtd-mac-address = <&factory 0xe000>;
-	mtd-mac-address-increment = <2>;
+	mac-address-increment = <2>;
 };
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 323a7906000..b19f70f7c95 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts
@@ -25,10 +25,10 @@
 
 &wifi0 {
 	mtd-mac-address = <&factory 0xe000>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &wifi1 {
 	mtd-mac-address = <&factory 0xe000>;
-	mtd-mac-address-increment = <2>;
+	mac-address-increment = <2>;
 };
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 fbf233d96f1..a4d72876abc 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-2660-a1.dts
@@ -25,10 +25,10 @@
 
 &wifi0 {
 	mtd-mac-address = <&factory 0xe000>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &wifi1 {
 	mtd-mac-address = <&factory 0xe000>;
-	mtd-mac-address-increment = <2>;
+	mac-address-increment = <2>;
 };
diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
index b6a73835574..f8ea5dbbbfa 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167ghbk2-s.dts
@@ -169,7 +169,7 @@
 		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&factory 0x0>;
 		mtd-mac-address = <&factory 0xe000>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 	};
 };
 
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 6349fd487ed..becd2a9f9de 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167gs2-b.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167gs2-b.dts
@@ -49,5 +49,5 @@
 
 &wifi {
 	mtd-mac-address = <&factory 0x4>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts
index 11b782488ab..5cc8ff27f67 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1167gst2.dts
@@ -49,5 +49,5 @@
 
 &wifi {
 	mtd-mac-address = <&factory 0xe006>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
diff --git a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
index 62423f02e5c..96893265708 100644
--- a/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
+++ b/target/linux/ramips/dts/mt7621_firefly_firewrt.dts
@@ -134,7 +134,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts
index e7b19fa42c1..f0152e8db3c 100644
--- a/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts
+++ b/target/linux/ramips/dts/mt7621_gehua_ghl-r-001.dts
@@ -131,7 +131,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
index 20f63902afa..629a9a24394 100644
--- a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
+++ b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
@@ -116,7 +116,7 @@
 
 &gmac0 {
 	mtd-mac-address = <&factory 0x4000>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &switch0 {
diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
index 879fb68c853..c549bbb5183 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
@@ -137,7 +137,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0x4>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 
 		port@1 {
diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
index 06d024e9a7c..91f30f87216 100644
--- a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
@@ -137,7 +137,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0x4>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 
 		port@1 {
diff --git a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
index 04996558a42..ec9be40ce40 100644
--- a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
+++ b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
@@ -142,7 +142,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0x5>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
index 45901474d2b..130193c171c 100644
--- a/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
+++ b/target/linux/ramips/dts/mt7621_mqmaker_witi.dts
@@ -123,7 +123,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
index 8a79d9ca9a6..cfa0e6af241 100644
--- a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
+++ b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
@@ -128,7 +128,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0x4>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
index 1a19cd048b2..eaf9059e39d 100644
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_ayx.dtsi
@@ -136,7 +136,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0x4>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi
index 71c95e75bd6..3ed8bc55e95 100644
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_bzv.dtsi
@@ -191,7 +191,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0x4>;
-			mtd-mac-address-increment = <2>;
+			mac-address-increment = <2>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
index 7a15cd1f6cb..61cb522dfdb 100644
--- a/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
+++ b/target/linux/ramips/dts/mt7621_netgear_sercomm_chj.dtsi
@@ -125,7 +125,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0x4>;
-			mtd-mac-address-increment = <2>;
+			mac-address-increment = <2>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
index d44960a9a1e..6ecf71895c3 100644
--- a/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
+++ b/target/linux/ramips/dts/mt7621_storylink_sap-g3200u3.dts
@@ -131,7 +131,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe006>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
index f597d0f63a3..0386a3cdd22 100644
--- a/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
+++ b/target/linux/ramips/dts/mt7621_telco-electronics_x1.dts
@@ -150,7 +150,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe006>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
index d0e38f1721b..4b53e60cd58 100644
--- a/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
+++ b/target/linux/ramips/dts/mt7621_totolink_a7000r.dts
@@ -129,7 +129,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_tplink_eap235-wall-v1.dts b/target/linux/ramips/dts/mt7621_tplink_eap235-wall-v1.dts
index 17308eb605b..cf63e6b989a 100644
--- a/target/linux/ramips/dts/mt7621_tplink_eap235-wall-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_eap235-wall-v1.dts
@@ -147,7 +147,7 @@
 		mediatek,mtd-eeprom = <&radio 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 		mtd-mac-address = <&info 0x8>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts b/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts
index 9f29ecd8cfe..0a810b0195b 100644
--- a/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts
+++ b/target/linux/ramips/dts/mt7621_tplink_re350-v1.dts
@@ -131,7 +131,7 @@
 		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&radio 0x0>;
 		mtd-mac-address = <&config 0x10008>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 	};
 };
 
@@ -141,7 +141,7 @@
 		mediatek,mtd-eeprom = <&radio 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 		mtd-mac-address = <&config 0x10008>;
-		mtd-mac-address-increment = <2>;
+		mac-address-increment = <2>;
 	};
 };
 
diff --git a/target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi b/target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi
index 45a983098d2..0ec83fa389b 100644
--- a/target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi
+++ b/target/linux/ramips/dts/mt7621_tplink_rexx0-v1.dtsi
@@ -149,7 +149,7 @@
 		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&radio 0x0>;
 		mtd-mac-address = <&config 0x10008>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 		ieee80211-freq-limit = <2400000 2500000>;
 	};
 };
@@ -160,7 +160,7 @@
 		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&radio 0x8000>;
 		mtd-mac-address = <&config 0x10008>;
-		mtd-mac-address-increment = <2>;
+		mac-address-increment = <2>;
 		ieee80211-freq-limit = <5000000 6000000>;
 	};
 };
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 9f921789003..536180be104 100644
--- a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts
+++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts
@@ -67,7 +67,7 @@
 			phy-handle = <&ephy7>;
 			phy-mode = "rgmii-rxid";
 			mtd-mac-address = <&factory 0x22>;
-			mtd-mac-address-increment = <5>;
+			mac-address-increment = <5>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi
index 04eb49bfa35..b92dc8f3f06 100644
--- a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi
+++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi
@@ -35,28 +35,28 @@
 			status = "okay";
 			label = "eth1";
 			mtd-mac-address = <&factory 0x22>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 
 		port@2 {
 			status = "okay";
 			label = "eth2";
 			mtd-mac-address = <&factory 0x22>;
-			mtd-mac-address-increment = <2>;
+			mac-address-increment = <2>;
 		};
 
 		port@3 {
 			status = "okay";
 			label = "eth3";
 			mtd-mac-address = <&factory 0x22>;
-			mtd-mac-address-increment = <3>;
+			mac-address-increment = <3>;
 		};
 
 		port@4 {
 			status = "okay";
 			label = "eth4";
 			mtd-mac-address = <&factory 0x22>;
-			mtd-mac-address-increment = <4>;
+			mac-address-increment = <4>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_unielec_u7621-01.dtsi b/target/linux/ramips/dts/mt7621_unielec_u7621-01.dtsi
index 336f68ea61a..b9b16fbb4bb 100644
--- a/target/linux/ramips/dts/mt7621_unielec_u7621-01.dtsi
+++ b/target/linux/ramips/dts/mt7621_unielec_u7621-01.dtsi
@@ -82,7 +82,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 
 		port@1 {
diff --git a/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi b/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi
index 3b149df85ad..29e62517214 100644
--- a/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi
+++ b/target/linux/ramips/dts/mt7621_unielec_u7621-06.dtsi
@@ -103,7 +103,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts
index b90ff92c704..ee1a452fa99 100644
--- a/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts
+++ b/target/linux/ramips/dts/mt7621_xiaoyu_xy-c5.dts
@@ -114,7 +114,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0x4>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
index 182b6db5b3d..afee235ac7d 100644
--- a/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
+++ b/target/linux/ramips/dts/mt7621_xzwifi_creativebox-v1.dts
@@ -182,7 +182,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
index d0d656ba6db..b1fbf539313 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg2626.dts
@@ -136,7 +136,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
index 515d37ceaa6..2fe855abd55 100644
--- a/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
+++ b/target/linux/ramips/dts/mt7621_zbtlink_zbt-wg3526.dtsi
@@ -140,7 +140,7 @@
 			status = "okay";
 			label = "wan";
 			mtd-mac-address = <&factory 0xe000>;
-			mtd-mac-address-increment = <1>;
+			mac-address-increment = <1>;
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
index f4d9823cd29..c70db4989bd 100644
--- a/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
+++ b/target/linux/ramips/dts/mt7628an_netgear_r6120.dts
@@ -45,5 +45,5 @@
 
 &wifi5 {
 	mtd-mac-address = <&factory 0x4>;
-	mtd-mac-address-increment = <(2)>;
+	mac-address-increment = <(2)>;
 };
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 58743db6b4d..55f39db6804 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v4.dts
@@ -78,7 +78,7 @@
 };
 
 &wmac {
-	mtd-mac-address-increment = <(-2)>;
+	mac-address-increment = <(-2)>;
 };
 
 &esw {
@@ -102,6 +102,6 @@
 		mediatek,mtd-eeprom = <&factory 0x28000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 		mtd-mac-address = <&factory 0xf100>;
-		mtd-mac-address-increment = <(-1)>;
+		mac-address-increment = <(-1)>;
 	};
 };
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 d76ce34ca9a..38879d70e69 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c20-v5.dts
@@ -97,6 +97,6 @@
 		mediatek,mtd-eeprom = <&radio 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 		mtd-mac-address = <&rom 0xf100>;
-		mtd-mac-address-increment = <(-1)>;
+		mac-address-increment = <(-1)>;
 	};
 };
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 4966d56a68f..bb13bac8c8e 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v3.dts
@@ -97,6 +97,6 @@
 		mediatek,mtd-eeprom = <&factory 0x28000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 		mtd-mac-address = <&factory 0xf100>;
-		mtd-mac-address-increment = <(-1)>;
+		mac-address-increment = <(-1)>;
 	};
 };
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 11bf903531b..34170547a4e 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_archer-c50-v4.dts
@@ -95,6 +95,6 @@
 		mediatek,mtd-eeprom = <&radio 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 		mtd-mac-address = <&rom 0xf100>;
-		mtd-mac-address-increment = <(-1)>;
+		mac-address-increment = <(-1)>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
index 95addff3c02..633950f287f 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
+++ b/target/linux/ramips/dts/mt7628an_tplink_re200.dtsi
@@ -138,7 +138,7 @@
 
 	mediatek,mtd-eeprom = <&radio 0x0>;
 	mtd-mac-address = <&config 0x2008>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &pcie {
@@ -151,6 +151,6 @@
 		mediatek,mtd-eeprom = <&radio 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 		mtd-mac-address = <&config 0x2008>;
-		mtd-mac-address-increment = <2>;
+		mac-address-increment = <2>;
 	};
 };
diff --git a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
index 22e15eb7a1a..300ea3bb297 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_re305-v1.dts
@@ -128,7 +128,7 @@
 		mediatek,mtd-eeprom = <&radio 0x8000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 		mtd-mac-address = <&config 0x10008>;
-		mtd-mac-address-increment = <2>;
+		mac-address-increment = <2>;
 	};
 };
 
@@ -137,7 +137,7 @@
 
 	mediatek,mtd-eeprom = <&radio 0x0>;
 	mtd-mac-address = <&config 0x10008>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &ethernet {
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 77a68acf340..d3558547b8e 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr902ac-v3.dts
@@ -93,6 +93,6 @@
 		mediatek,mtd-eeprom = <&factory 0x28000>;
 		ieee80211-freq-limit = <5000000 6000000>;
 		mtd-mac-address = <&factory 0xf100>;
-		mtd-mac-address-increment = <(-1)>;
+		mac-address-increment = <(-1)>;
 	};
 };
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 37797fc368c..ff562cbff40 100644
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4a-100m.dts
@@ -36,7 +36,7 @@
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &esw {
diff --git a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts
index ccf9917dac6..6bed6f57bcc 100644
--- a/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts
+++ b/target/linux/ramips/dts/rt3883_sitecom_wlr-6000.dts
@@ -65,7 +65,7 @@
 &ethernet {
 	status = "okay";
 	mtd-mac-address = <&factory 0x8004>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 
 	port@0 {
 		phy-handle = <&phy0>;
diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
index 03e504a6d19..b5cae66732e 100644
--- a/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
+++ b/target/linux/ramips/dts/rt3883_trendnet_tew-691gr.dts
@@ -117,5 +117,5 @@
 	ralink,mtd-eeprom = <&factory 0x0>;
 	ralink,5ghz = <0>;
 	mtd-mac-address = <&factory 0x4>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
diff --git a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts
index 95a2bb75f3e..39fb3d1c78d 100644
--- a/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts
+++ b/target/linux/ramips/dts/rt3883_trendnet_tew-692gr.dts
@@ -143,5 +143,5 @@
 	ralink,mtd-eeprom = <&factory 0x0>;
 	ralink,5ghz = <0>;
 	mtd-mac-address = <&factory 0x4>;
-	mtd-mac-address-increment = <3>;
+	mac-address-increment = <3>;
 };