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>

79 files changed, 104 insertions, 103 deletions

diff --git a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
index e24236324c..083db183d4 100644
--- a/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
+++ b/target/linux/ath79/dts/ar7161_aruba_ap-105.dts
@@ -104,7 +104,7 @@
 	ath9k0: wifi@0,11 { /* 2.4 GHz */
 		compatible = "pci168c,0029";
 		mtd-mac-address = <&hwinfo 0x1c>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 		reg = <0x8800 0 0 0 0>;
 		#gpio-cells = <2>;
 		gpio-controller;
@@ -113,7 +113,7 @@
 	ath9k1: wifi@0,12 { /* 5 GHz */
 		compatible = "pci168c,0029";
 		mtd-mac-address = <&hwinfo 0x1c>;
-		mtd-mac-address-increment = <2>;
+		mac-address-increment = <2>;
 		reg = <0x9000 0 0 0 0>;
 		#gpio-cells = <2>;
 		gpio-controller;
diff --git a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
index b8176dc059..15ac148697 100644
--- a/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
+++ b/target/linux/ath79/dts/ar7161_buffalo_wzr-hp-ag300h.dtsi
@@ -259,7 +259,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&art 0x520c>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 
 	phy-handle = <&phy4>;
 };
diff --git a/target/linux/ath79/dts/ar7161_meraki_mr16.dts b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
index afbf1e31f2..3d11e641eb 100644
--- a/target/linux/ath79/dts/ar7161_meraki_mr16.dts
+++ b/target/linux/ath79/dts/ar7161_meraki_mr16.dts
@@ -82,7 +82,7 @@
 		reg = <0x8800 0 0 0 0>;
 		qca,no-eeprom;
 		mtd-mac-address = <&config 0x66>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 		#gpio-cells = <2>;
 		gpio-controller;
 	};
@@ -92,7 +92,7 @@
 		reg = <0x9000 0 0 0 0>;
 		qca,no-eeprom;
 		mtd-mac-address = <&config 0x66>;
-		mtd-mac-address-increment = <2>;
+		mac-address-increment = <2>;
 		#gpio-cells = <2>;
 		gpio-controller;
 	};
diff --git a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
index e5d7ea57f1..7f736dc005 100644
--- a/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
+++ b/target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts
@@ -160,7 +160,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&art 0x120c>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &pcie {
diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
index 7e1c87adde..931032d851 100644
--- a/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts
@@ -190,7 +190,7 @@
 		compatible = "pci168c,002b";
 		reg = <0x0000 0 0 0 0>;
 		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 		qca,no-eeprom;
 		#gpio-cells = <2>;
 		gpio-controller;
diff --git a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
index 7202e1d684..91438ebf8f 100644
--- a/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
+++ b/target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi
@@ -123,7 +123,7 @@
 		compatible = "pci168c,002b";
 		reg = <0x0000 0 0 0 0>;
 		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 		qca,no-eeprom;
 		#gpio-cells = <2>;
 		gpio-controller;
diff --git a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
index bd6caacdf6..adc6cc87b3 100644
--- a/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
+++ b/target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi
@@ -31,12 +31,12 @@
 
 &eth0 {
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &eth1 {
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &ath9k {
diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
index de2b536227..380f82a59f 100644
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts
@@ -195,7 +195,7 @@
 		compatible = "pci168c,002e";
 		reg = <0x0000 0 0 0 0>;
 		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 		qca,no-eeprom;
 		#gpio-cells = <2>;
 		gpio-controller;
diff --git a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
index e704ddd9fc..0098b0f03e 100644
--- a/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
+++ b/target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi
@@ -171,7 +171,7 @@
 		compatible = "pci168c,002e";
 		reg = <0x0000 0 0 0 0>;
 		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 		qca,no-eeprom;
 		#gpio-cells = <2>;
 		gpio-controller;
diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi
index 6d7f7515ef..c2c81b3a87 100644
--- a/target/linux/ath79/dts/ar7241_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink.dtsi
@@ -97,10 +97,10 @@
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &eth1 {
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
index ca1ad270ce..4cc6d2a8f1 100644
--- a/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts
@@ -143,10 +143,10 @@
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &eth1 {
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
diff --git a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
index 436d8c1289..3e2a67697f 100644
--- a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
+++ b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
@@ -78,7 +78,7 @@
 		compatible = "pci168c,002a";
 		reg = <0x0 0 0 0 0>;
 		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 		qca,no-eeprom;
 		#gpio-cells = <2>;
 		gpio-controller;
diff --git a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
index be9a193170..9026eb997f 100644
--- a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
+++ b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
@@ -78,7 +78,7 @@
 		compatible = "pci168c,002a";
 		reg = <0x0 0 0 0 0>;
 		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <(-1)>;
+		mac-address-increment = <(-1)>;
 		qca,no-eeprom;
 		#gpio-cells = <2>;
 		gpio-controller;
diff --git a/target/linux/ath79/dts/ar7242_meraki_mr12.dts b/target/linux/ath79/dts/ar7242_meraki_mr12.dts
index ea64b947ef..8a19bffe6e 100644
--- a/target/linux/ath79/dts/ar7242_meraki_mr12.dts
+++ b/target/linux/ath79/dts/ar7242_meraki_mr12.dts
@@ -82,7 +82,7 @@
 		reg = <0x0000 0 0 0 0>;
 		qca,no-eeprom;
 		mtd-mac-address = <&config 0x66>;
-		mtd-mac-address-increment = <1>;
+		mac-address-increment = <1>;
 	};
 };
 
diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
index 48bf4d159f..b14e70c132 100644
--- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
@@ -94,8 +94,8 @@
 	status = "okay";
 
 	mtd-mac-address = <&art 0x1002>;
-	mtd-mac-address-increment-byte = <3>;
-	mtd-mac-address-increment = <0x40>;
+	mac-address-increment-byte = <3>;
+	mac-address-increment = <0x40>;
 };
 
 &mdio1 {
diff --git a/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi b/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi
index 3f20843b08..261657312b 100644
--- a/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi
+++ b/target/linux/ath79/dts/ar9331_hak5_lan-turtle.dtsi
@@ -25,7 +25,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 
 	gmac-config {
 		device = <&gmac>;
@@ -39,7 +39,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &pinmux {
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi
index 7d2cbeb95c..9207a0fde0 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr710n.dtsi
@@ -61,7 +61,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &usb {
diff --git a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
index e460e4cd23..248a2b646e 100644
--- a/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
+++ b/target/linux/ath79/dts/ar9331_tplink_tl-wr741nd-v4.dtsi
@@ -122,7 +122,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 
 	gmac-config {
 		device = <&gmac>;
@@ -136,7 +136,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &wmac {
diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
index 1d742a785d..f822c69aee 100644
--- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
+++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
@@ -134,7 +134,7 @@
 
 	phy-handle = <&swphy0>;
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/ar9341_tplink.dtsi b/target/linux/ath79/dts/ar9341_tplink.dtsi
index 26410bcc11..0f6e0bc114 100644
--- a/target/linux/ath79/dts/ar9341_tplink.dtsi
+++ b/target/linux/ath79/dts/ar9341_tplink.dtsi
@@ -82,7 +82,7 @@
 	phy-handle = <&swphy0>;
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
index fae3eec786..2f87194375 100644
--- a/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
+++ b/target/linux/ath79/dts/ar9344_aerohive_hiveap-121.dts
@@ -107,7 +107,7 @@
 		reg = <0x0000 0 0 0 0>;
 
 		mtd-mac-address = <&hw_info 0x0>;
-		mtd-mac-address-increment = <2>;
+		mac-address-increment = <2>;
 	};
 };
 
@@ -161,7 +161,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&hw_info 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &nand {
diff --git a/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi b/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
index 9424e48654..b61ab75ae8 100644
--- a/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
+++ b/target/linux/ath79/dts/ar9344_devolo_dlan_wifi.dtsi
@@ -131,7 +131,7 @@
 	pll-data = <0x02000000 0x00000101 0x00001616>;
 
 	mtd-mac-address = <&art 0x1002>;
-	mtd-mac-address-increment = <2>;
+	mac-address-increment = <2>;
 
 	phy-mode = "rgmii";
 	phy-handle = <&phy0>;
diff --git a/target/linux/ath79/dts/ar9344_engenius_eap600.dts b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
index c6961f636e..b25e3be17f 100644
--- a/target/linux/ath79/dts/ar9344_engenius_eap600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_eap600.dts
@@ -30,7 +30,7 @@
 
 &eth0 {
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <(-2)>;
+	mac-address-increment = <(-2)>;
 };
 
 &pcie {
@@ -41,5 +41,5 @@
 
 &wmac {
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
diff --git a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
index 13167adc4d..6c7a99c477 100644
--- a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
+++ b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts
@@ -30,11 +30,11 @@
 &pcie {
 	wifi@0,0,0 {
 		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <(-2)>;
+		mac-address-increment = <(-2)>;
 	};
 };
 
 &wmac {
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
diff --git a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
index ff532733b6..6a7af59147 100644
--- a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
+++ b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
@@ -114,7 +114,7 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &pcie {
@@ -125,6 +125,6 @@
 		reg = <0x0000 0 0 0 0>;
 		qca,no-eeprom;
 		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <8>;
+		mac-address-increment = <8>;
 	};
 };
diff --git a/target/linux/ath79/dts/ar9344_pcs_cap324.dts b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
index 3ce8bb58fc..4125a40269 100644
--- a/target/linux/ath79/dts/ar9344_pcs_cap324.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cap324.dts
@@ -119,7 +119,7 @@
 		compatible = "168c,0030";
 		reg = <0x0000 0 0 0 0>;
 		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <(-2)>;
+		mac-address-increment = <(-2)>;
 		mtd-cal-data = <&art 0x5000>;
 		qca,no-eeprom;
 		qca,disable-5ghz;
@@ -134,7 +134,7 @@
 	qca,disable-2ghz;
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &mdio0 {
diff --git a/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-16m.dts b/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-16m.dts
index 61389be127..366a0f720a 100644
--- a/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-16m.dts
+++ b/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-16m.dts
@@ -25,7 +25,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&pridata 0x400>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-8m.dts b/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-8m.dts
index e232cdab24..994b842f34 100644
--- a/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-8m.dts
+++ b/target/linux/ath79/dts/ar9344_qxwlan_e750a-v4-8m.dts
@@ -25,7 +25,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&pridata 0x400>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/ar9344_samsung_wam250.dts b/target/linux/ath79/dts/ar9344_samsung_wam250.dts
index 0f38ff82ee..bca757e77f 100644
--- a/target/linux/ath79/dts/ar9344_samsung_wam250.dts
+++ b/target/linux/ath79/dts/ar9344_samsung_wam250.dts
@@ -67,7 +67,7 @@
 	phy-handle = <&swphy0>;
 
 	mtd-mac-address = <&art 0x1002>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 
 	gmac-config {
 		device = <&gmac>;
diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
index eb9606e58b..22c2163fec 100644
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955-h7v3c0.dts
@@ -165,7 +165,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&config 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
index ba840a05d3..28dbb74511 100644
--- a/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut955.dts
@@ -164,7 +164,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&config 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
index d9c66d2745..53fe69ae00 100644
--- a/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
+++ b/target/linux/ath79/dts/ar9344_teltonika_rut9xx.dtsi
@@ -148,7 +148,7 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&config 0x0>;
-	mtd-mac-address-increment = <2>;
+	mac-address-increment = <2>;
 };
 
 &pinmux {
diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
index 59a06346ae..e8f9672b58 100644
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3500-v1.dts
@@ -58,7 +58,7 @@
 
 &ath9k {
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &wmac {
@@ -69,7 +69,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 
 	gmac-config {
 		device = <&gmac>;
@@ -84,5 +84,5 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <2>;
+	mac-address-increment = <2>;
 };
diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
index 21fd079e1a..f8b4d0385a 100644
--- a/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
+++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr4300.dtsi
@@ -85,7 +85,7 @@
 
 &wmac {
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &mdio0 {
diff --git a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
index 72cd5aab49..87bbd206b2 100644
--- a/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
+++ b/target/linux/ath79/dts/ar9344_winchannel_wb2000.dts
@@ -142,7 +142,7 @@
 		reg = <0x0000 0 0 0 0>;
 		qca,no-eeprom;
 		mtd-mac-address = <&addr 0x0>;
-		mtd-mac-address-increment = <0x10>;
+		mac-address-increment = <0x10>;
 		#gpio-cells = <2>;
 		gpio-controller;
 	};
@@ -198,7 +198,7 @@
 	pll-data = <0xe000000 0x04000101 0x04001313>;
 
 	mtd-mac-address = <&addr 0x0>;
-	mtd-mac-address-increment = <0x21>;
+	mac-address-increment = <0x21>;
 
 	phy-mode = "rgmii-rxid";
 	phy-handle = <&phy4>;
diff --git a/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts b/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
index 40eabd0488..4f0e371c22 100644
--- a/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
+++ b/target/linux/ath79/dts/qca9531_alfa-network_n2q.dts
@@ -107,12 +107,12 @@
 
 &eth0 {
 	mtd-mac-address = <&art 0x1002>;
-	mtd-mac-address-increment = <(-2)>;
+	mac-address-increment = <(-2)>;
 };
 
 &eth1 {
 	mtd-mac-address = <&art 0x1002>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &pcie0 {
diff --git a/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts b/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts
index 42f2c9ffe5..4288e92fcd 100644
--- a/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts
+++ b/target/linux/ath79/dts/qca9531_alfa-network_pi-wifi4.dts
@@ -46,7 +46,7 @@
 
 &eth0 {
 	mtd-mac-address = <&art 0x1002>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
index ab65369246..1effb4485b 100644
--- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
+++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dts
@@ -51,7 +51,7 @@
 
 &eth0 {
 	mtd-mac-address = <&art 0x1002>;
-	mtd-mac-address-increment = <(-2)>;
+	mac-address-increment = <(-2)>;
 };
 
 &eth1 {
@@ -60,7 +60,7 @@
 	compatible = "qca,qca9530-eth", "syscon", "simple-mfd";
 
 	mtd-mac-address = <&art 0x1002>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &gpio_export {
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
index a7ea34eeb0..634d20015d 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-e560ac.dts
@@ -151,7 +151,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
@@ -163,5 +163,5 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <10>;
+	mac-address-increment = <10>;
 };
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
index edb6bbe5f3..f67a8cbb72 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-ew72.dts
@@ -110,7 +110,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
@@ -122,5 +122,5 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <3>;
+	mac-address-increment = <3>;
 };
diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
index 6ae2e4eb54..44c85b62e1 100644
--- a/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_comfast_cf-wr752ac-v1.dts
@@ -122,5 +122,5 @@
 	mtd-cal-data = <&art 0x1000>;
 
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <10>;
+	mac-address-increment = <10>;
 };
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index d0b0d88c48..3b20fa51ab 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -151,7 +151,7 @@
 
 &eth1 {
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &wmac {
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
index 24dc8aaf6a..80623085f0 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar750.dts
@@ -134,7 +134,7 @@
 
 &eth1 {
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &wmac {
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index c755e00033..8cb611c11d 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -123,7 +123,7 @@
 
 &eth1 {
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &wmac {
diff --git a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
index 7c6ed9f4fe..6423ae0272 100644
--- a/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
+++ b/target/linux/ath79/dts/qca9531_qxwlan_e600g.dtsi
@@ -96,7 +96,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&pridata 0x400>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
index 9a39001935..1113c51be5 100644
--- a/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_archer-d50-v1.dts
@@ -147,7 +147,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&romfile 0xf100>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
index 0e2c158260..4c730375a6 100644
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr3420-v3.dts
@@ -172,7 +172,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
index 82a73d301d..47d9e0846a 100644
--- a/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-mr6400-v1.dts
@@ -129,12 +129,12 @@
 	phy-handle = <&swphy0>;
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
 
 &wmac {
diff --git a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
index 69445df741..a769a81d58 100644
--- a/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
+++ b/target/linux/ath79/dts/qca9531_tplink_tl-wr902ac-v1.dts
@@ -148,7 +148,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&info 0x8>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
index 53eb08b253..e38fc9378a 100644
--- a/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
+++ b/target/linux/ath79/dts/qca9533_openmesh_om2p-v4.dtsi
@@ -149,5 +149,5 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <2>;
+	mac-address-increment = <2>;
 };
diff --git a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
index c506c849f9..6df843f143 100644
--- a/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
+++ b/target/linux/ath79/dts/qca9533_plasmacloud_pa300.dtsi
@@ -124,7 +124,7 @@
 	compatible = "qca,qca9530-eth", "syscon", "simple-mfd";
 
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &wmac {
@@ -132,5 +132,5 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <2>;
+	mac-address-increment = <2>;
 };
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
index fb034195ec..1835cbcb96 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr802n.dtsi
@@ -74,7 +74,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
index 4166686795..df68a56d47 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr841.dtsi
@@ -109,7 +109,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
index db99f70b36..cb93afa233 100644
--- a/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
+++ b/target/linux/ath79/dts/qca9533_tplink_tl-wr842n-v3.dts
@@ -149,7 +149,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
index ab8ac92426..27d9681ead 100644
--- a/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
+++ b/target/linux/ath79/dts/qca953x_tplink_tl-wr810n.dtsi
@@ -91,7 +91,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
index 80298a9d82..0b006bcffb 100644
--- a/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
+++ b/target/linux/ath79/dts/qca9557_engenius_eap1200h.dts
@@ -90,5 +90,5 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
diff --git a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
index 5da50ff6d9..9a45bd4277 100644
--- a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
+++ b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
@@ -100,7 +100,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 
 	phy-handle = <&phy2>;
 
diff --git a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
index 973cb16efb..3b9e25e3e8 100644
--- a/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
+++ b/target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts
@@ -90,5 +90,6 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
+	qca-no-eeprom;
 };
diff --git a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
index e4bb6c25e5..81c2c0866f 100644
--- a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
+++ b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
@@ -199,7 +199,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 	pll-data = <0x03000101 0x00000101 0x00001616>;
 
 	fixed-link {
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
index 9e38a9f392..85617cc809 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1200e.dts
@@ -59,7 +59,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&art 0x00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 
 	phy-handle = <&phy1>;
 	pll-data = <0x03000101 0x00000101 0x00001313>;
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
index 0a1c9cb6dd..895398e358 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1750e.dts
@@ -94,7 +94,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&art 0x00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 
 	phy-handle = <&phy1>;
 	pll-data = <0x03000101 0x00000101 0x00001313>;
diff --git a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
index 7ae33c3e04..ba7f014e6a 100644
--- a/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
+++ b/target/linux/ath79/dts/qca9558_devolo_dvl1xxx.dtsi
@@ -114,5 +114,5 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&art 0x00>;
-	mtd-mac-address-increment = <(-2)>;
+	mac-address-increment = <(-2)>;
 };
diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
index f4eed22460..fa379030e7 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr.dtsi
@@ -157,7 +157,7 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &pcie0 {
diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
index f7889b00cc..6704fbbe81 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v1.dts
@@ -20,6 +20,6 @@
 		compatible = "pci168c,0033";
 		reg = <0x0000 0 0 0 0>;
 		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <16>;
+		mac-address-increment = <16>;
 	};
 };
diff --git a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
index 1f54d2134a..7221b5b098 100644
--- a/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_openmesh_mr900-v2.dts
@@ -20,6 +20,6 @@
 		compatible = "pci168c,0033";
 		reg = <0x0000 0 0 0 0>;
 		mtd-mac-address = <&art 0x0>;
-		mtd-mac-address-increment = <16>;
+		mac-address-increment = <16>;
 	};
 };
diff --git a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
index 21946c42b2..e1c44af3f7 100644
--- a/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
+++ b/target/linux/ath79/dts/qca9558_qxwlan_e558.dtsi
@@ -128,7 +128,7 @@
 	phy-handle = <&phy0>;
 
 	mtd-mac-address = <&pridata 0x400>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
index 52cbb5d016..3f965f5b95 100644
--- a/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-c.dtsi
@@ -150,7 +150,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 	phy-handle = <&phy0>;
 	pll-data = <0x56000000 0x00000101 0x00001616>;
 
diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
index fd1717b668..90332f1874 100644
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7-v1.dts
@@ -71,7 +71,7 @@
 
 &eth0 {
 	mtd-mac-address = <&romfs 0xf100>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts b/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
index d2ef7e82a7..754cb17918 100644
--- a/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_archer-d7b-v1.dts
@@ -65,7 +65,7 @@
 
 &eth0 {
 	mtd-mac-address = <&romfs 0xf100>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
index 6c487f15be..b12b547a7f 100644
--- a/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
@@ -166,5 +166,5 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&info 0x8>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
index 0099592dc1..10d6e6040b 100644
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wdr4900-v2.dts
@@ -97,7 +97,7 @@
 		compatible = "pci168c,0033";
 		reg = <0x0000 0 0 0 0>;
 		mtd-mac-address = <&uboot 0x1fc00>;
-		mtd-mac-address-increment = <(-2)>;
+		mac-address-increment = <(-2)>;
 		qca,no-eeprom;
 		#gpio-cells = <2>;
 		gpio-controller;
@@ -191,7 +191,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 	phy-handle = <&phy0>;
 	pll-data = <0x56000000 0x00000101 0x00001616>;
 
@@ -218,5 +218,5 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
diff --git a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
index 959d5c35fb..8f2b626bad 100644
--- a/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
+++ b/target/linux/ath79/dts/qca9558_tplink_tl-wr1043nd.dtsi
@@ -146,7 +146,7 @@
 	pll-data = <0x56000000 0x00000101 0x00001616>;
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 	phy-handle = <&phy0>;
 };
 
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
index bf744f1087..66a578305d 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c25-v1.dts
@@ -179,7 +179,7 @@
 	status = "okay";
 
 	mtd-mac-address = <&info 0x8>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &wmac {
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
index 664032936c..673805e132 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c5x.dtsi
@@ -127,7 +127,7 @@
 	phy-handle = <&swphy0>;
 
 	mtd-mac-address = <&info 0x8>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 
 	gmac-config {
 		device = <&gmac>;
diff --git a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
index 75d3816b72..5c5d1620b9 100644
--- a/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
+++ b/target/linux/ath79/dts/qca9561_tplink_archer-c6x.dtsi
@@ -73,7 +73,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&info 0x8>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {
diff --git a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
index 821f125c20..6693a5cd73 100644
--- a/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
+++ b/target/linux/ath79/dts/qca9561_xiaomi_mi-router-4q.dts
@@ -134,5 +134,5 @@
 
 	mtd-cal-data = <&art 0x1000>;
 	mtd-mac-address = <&art 0x0>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
diff --git a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
index 78eb0fe219..044485316c 100644
--- a/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
+++ b/target/linux/ath79/dts/qca9563_elecom_wrc-ghbk2-i.dtsi
@@ -106,7 +106,7 @@
 	pll-data = <0x03000101 0x00000101 0x00001919>;
 
 	mtd-mac-address = <&art 0x1002>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 	phy-mode = "sgmii";
 	phy-handle = <&phy0>;
 };
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
index 5c897b16a0..c1c553e8c8 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wr940n-v3.dtsi
@@ -64,5 +64,5 @@
 
 &eth1 {
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <(-1)>;
+	mac-address-increment = <(-1)>;
 };
diff --git a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
index 31079123c5..14e10596b5 100644
--- a/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
+++ b/target/linux/ath79/dts/tp9343_tplink_tl-wx.dtsi
@@ -51,7 +51,7 @@
 	phy-handle = <&swphy4>;
 
 	mtd-mac-address = <&uboot 0x1fc00>;
-	mtd-mac-address-increment = <1>;
+	mac-address-increment = <1>;
 };
 
 &eth1 {