ipq40xx: remove mac-address-increment

nvmem-layout allows removal

Signed-off-by: Rosen Penev <[email protected]>

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-gl-a1300.dts

@@ -183,7 +183,9 @@
 					#size-cells = <1>;
 
 					macaddr_gmac0: macaddr@0 {
+						compatible = "mac-base";
 						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 
 					macaddr_gmac1: macaddr@6 {
@@ -305,8 +307,7 @@
 
 	label = "lan2";
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_gmac0>;
-	mac-address-increment = <2>;
+	nvmem-cells = <&macaddr_gmac0 2>;
 };
 
 &swport4 {
@@ -314,7 +315,7 @@
 
 	label = "lan1";
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_gmac0>;
+	nvmem-cells = <&macaddr_gmac0 0>;
 };
 
 &swport5 {

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts

@@ -143,7 +143,9 @@
 					#size-cells = <1>;
 
 					macaddr_mac_0: macaddr@0 {
+						compatible = "mac-base";
 						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi

@@ -129,8 +129,7 @@
 &gmac {
 	status = "okay";
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_mac_0>;
-	mac-address-increment = <2>;
+	nvmem-cells = <&macaddr_mac_0 2>;
 };
 
 &switch {
@@ -180,12 +179,11 @@
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0>;
+	nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0 0>;
 };
 
 &wifi1 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0>;
-	mac-address-increment = <1>;
+	nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0 1>;
 };

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts

@@ -143,7 +143,9 @@
 					#size-cells = <1>;
 
 					macaddr_mac_0: macaddr@0 {
+						compatible = "mac-base";
 						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts

@@ -160,7 +160,9 @@
 					#size-cells = <1>;
 
 					macaddr_mac_0: macaddr@0 {
+						compatible = "mac-base";
 						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wac510.dts

@@ -270,7 +270,9 @@
 					#size-cells = <1>;
 
 					macaddr_manudata_6: macaddr@6 {
+						compatible = "mac-base";
 						reg = <0x6 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -373,14 +375,13 @@
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_1000>, <&macaddr_manudata_6>;
+	nvmem-cells = <&precal_art_1000>, <&macaddr_manudata_6 0>;
 	qcom,ath10k-calibration-variant = "Netgear-WAC510";
 };
 
 &wifi1 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_5000>, <&macaddr_manudata_6>;
-	mac-address-increment = <16>;
+	nvmem-cells = <&precal_art_5000>, <&macaddr_manudata_6 16>;
 	qcom,ath10k-calibration-variant = "Netgear-WAC510";
 };

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf18a.dts

@@ -238,7 +238,7 @@
 &gmac {
 	status = "okay";
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_config_0>;
+	nvmem-cells = <&macaddr_config_0 0>;
 };
 
 &switch {
@@ -251,8 +251,7 @@
 	label = "wan";
 
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_config_0>;
-	mac-address-increment = <1>;
+	nvmem-cells = <&macaddr_config_0 1>;
 };
 
 &swport3 {
@@ -309,7 +308,9 @@
 					#size-cells = <1>;
 
 					macaddr_config_0: macaddr@0 {
+						compatible = "mac-base";
 						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -457,8 +458,7 @@
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>;
-	mac-address-increment = <2>;
+	nvmem-cells = <&precal_art_1000>, <&macaddr_config_0 2>;
 	qcom,ath10k-calibration-variant = "ZTE-MF18A";
 };
 
@@ -478,8 +478,7 @@
 		wifi2: wifi@1,0 {
 			compatible = "pci168c,0040";
 			nvmem-cell-names = "pre-calibration", "mac-address";
-			nvmem-cells = <&precal_art_9000>, <&macaddr_config_0>;
-			mac-address-increment = <3>;
+			nvmem-cells = <&precal_art_9000>, <&macaddr_config_0 3>;
 			qcom,ath10k-calibration-variant = "ZTE-MF18A";
 			reg = <0x00010000 0 0 0 0>;
 		};

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf282plus.dts

@@ -223,7 +223,7 @@
 &gmac {
 	status = "okay";
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_config_0>;
+	nvmem-cells = <&macaddr_config_0 0>;
 };
 
 &nand {
@@ -274,7 +274,9 @@
 					#size-cells = <1>;
 
 					macaddr_config_0: macaddr@0 {
+						compatible = "mac-base";
 						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -436,8 +438,7 @@
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>;
-	mac-address-increment = <1>;
+	nvmem-cells = <&precal_art_1000>, <&macaddr_config_0 1>;
 	qcom,ath10k-calibration-variant = "zte,mf286d";
 };
 
@@ -448,7 +449,6 @@
 &wifi1 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_5000>, <&macaddr_config_0>;
-	mac-address-increment = <1>;
+	nvmem-cells = <&precal_art_5000>, <&macaddr_config_0 1>;
 	qcom,ath10k-calibration-variant = "zte,mf286d";
 };

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf286d.dts

@@ -216,7 +216,7 @@
 &gmac {
 	status = "okay";
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_config_0>;
+	nvmem-cells = <&macaddr_config_0 0>;
 };
 
 &nand {
@@ -267,7 +267,9 @@
 					#size-cells = <1>;
 
 					macaddr_config_0: macaddr@0 {
+						compatible = "mac-base";
 						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -353,8 +355,7 @@
 	status = "okay";
 
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_config_0>;
-	mac-address-increment = <1>;
+	nvmem-cells = <&macaddr_config_0 1>;
 };
 
 &tlmm {
@@ -440,15 +441,13 @@
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_1000>, <&macaddr_config_0>;
-	mac-address-increment = <2>;
+	nvmem-cells = <&precal_art_1000>, <&macaddr_config_0 2>;
 	qcom,ath10k-calibration-variant = "zte,mf286d";
 };
 
 &wifi1 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_5000>, <&macaddr_config_0>;
-	mac-address-increment = <3>;
+	nvmem-cells = <&precal_art_5000>, <&macaddr_config_0 3>;
 	qcom,ath10k-calibration-variant = "zte,mf286d";
 };

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts

@@ -243,7 +243,9 @@
 					#size-cells = <1>;
 
 					macaddr_mac_0: macaddr@0 {
+						compatible = "mac-base";
 						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -316,7 +318,7 @@
 &gmac {
 	status = "okay";
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_mac_0>;
+	nvmem-cells = <&macaddr_mac_0 0>;
 };
 
 &switch {
@@ -329,8 +331,7 @@
 	label = "wan";
 
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_mac_0>;
-	mac-address-increment = <1>;
+	nvmem-cells = <&macaddr_mac_0 1>;
 };
 
 &swport5 {
@@ -407,8 +408,7 @@
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0>;
-	mac-address-increment = <2>;
+	nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0 2>;
 	qcom,ath10k-calibration-variant = "zte,mf289f";
 };
 
@@ -416,8 +416,7 @@
 &wifi1 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0>;
-	mac-address-increment = <3>;
+	nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0 3>;
 	qcom,ath10k-calibration-variant = "zte,mf289f";
 };
 
@@ -436,8 +435,7 @@
 
 		wifi2: wifi@1,0 {
 			nvmem-cell-names = "mac-address";
-			nvmem-cells = <&macaddr_mac_0>;
-			mac-address-increment = <4>;
+			nvmem-cells = <&macaddr_mac_0 4>;
 			compatible = "qcom,ath10k";
 			reg = <0x00010000 0 0 0 0>;
 			qcom,ath10k-calibration-variant = "zte,mf289f";

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-whw03v2.dts

@@ -362,7 +362,9 @@
 					#size-cells = <1>;
 
 					macaddr_gmac0: macaddr@0 {
+						compatible = "mac-base";
 						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 
 					macaddr_gmac1: macaddr@6 {
@@ -479,7 +481,7 @@
 	label = "wan";
 
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_gmac0>;
+	nvmem-cells = <&macaddr_gmac0 0>;
 };
 
 &wifi0 {
@@ -495,8 +497,7 @@
 	qcom,ath10k-calibration-variant = "linksys-whw03v2";
 
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_1000>, <&macaddr_gmac0>;
-	mac-address-increment = <1>;
+	nvmem-cells = <&precal_art_1000>, <&macaddr_gmac0 1>;
 };
 
 &wifi1 {
@@ -506,8 +507,7 @@
 	qcom,ath10k-calibration-variant = "linksys-whw03v2";
 
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_5000>, <&macaddr_gmac0>;
-	mac-address-increment = <2>;
+	nvmem-cells = <&precal_art_5000>, <&macaddr_gmac0 2>;
 };
 
 &wifi2 {
@@ -517,6 +517,5 @@
 	qcom,ath10k-calibration-variant = "linksys-whw03v2";
 
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0>;
-	mac-address-increment = <3>;
+	nvmem-cells = <&precal_art_9000>, <&macaddr_gmac0 3>;
 };

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts

@@ -151,7 +151,9 @@
 					#size-cells = <1>;
 
 					macaddr_mfginfo_1d: macaddr@1d {
+						compatible = "mac-base";
 						reg = <0x1d 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts

@@ -366,7 +366,9 @@
 					};
 
 					macaddr_mfginfo_45: macaddr@45 {
+						compatible = "mac-base";
 						reg = <0x45 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};
@@ -465,14 +467,13 @@
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_45>;
+	nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_45 0>;
 	qcom,ath10k-calibration-variant = "Aruba-AP-303";
 };
 
 &wifi1 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_45>;
-	mac-address-increment = <1>;
+	nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_45 1>;
 	qcom,ath10k-calibration-variant = "Aruba-AP-303";
 };

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-365.dts

@@ -195,7 +195,9 @@
 					#size-cells = <1>;
 
 					macaddr_mfginfo_1d: macaddr@1d {
+						compatible = "mac-base";
 						reg = <0x1d 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 				};
 			};

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-aruba-glenmorangie.dtsi

@@ -259,14 +259,13 @@
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_1d>;
+	nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_1d 0>;
 	qcom,ath10k-calibration-variant = "Aruba-AP-303";
 };
 
 &wifi1 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_1d>;
-	mac-address-increment = <1>;
+	nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_1d 1>;
 	qcom,ath10k-calibration-variant = "Aruba-AP-303";
 };

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts

@@ -202,7 +202,9 @@
 					#size-cells = <1>;
 
 					macaddr_gmac0: macaddr@0 {
+						compatible = "mac-base";
 						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 
 					macaddr_gmac1: macaddr@6 {
@@ -291,8 +293,7 @@
 
 	label = "lan2";
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_gmac0>;
-	mac-address-increment = <2>;
+	nvmem-cells = <&macaddr_gmac0 2>;
 };
 
 &swport4 {
@@ -300,7 +301,7 @@
 
 	label = "lan1";
 	nvmem-cell-names = "mac-address";
-	nvmem-cells = <&macaddr_gmac0>;
+	nvmem-cells = <&macaddr_gmac0 0>;
 };
 
 &swport5 {

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-insect-common.dtsi

@@ -137,7 +137,9 @@
 		#size-cells = <1>;
 
 		mac_address: mac-address@66 {
+			compatible = "mac-base";
 			reg = <0x66 0x6>;
+			#nvmem-cell-cells = <1>;
 		};
 	};
 };
@@ -284,9 +286,8 @@
 			compatible = "qcom,ath10k";
 			status = "okay";
 			reg = <0x00010000 0 0 0 0>;
-			nvmem-cells = <&mac_address>;
+			nvmem-cells = <&mac_address 1>;
 			nvmem-cell-names = "mac-address";
-			mac-address-increment = <1>;
 		};
 	};
 };
@@ -390,22 +391,20 @@
 &wifi0 {
 	status = "okay";
 	qcom,ath10k-calibration-variant = "Meraki-MR33";
-	nvmem-cells = <&mac_address>;
+	nvmem-cells = <&mac_address 2>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <2>;
 };
 
 &wifi1 {
 	status = "okay";
 	qcom,ath10k-calibration-variant = "Meraki-MR33";
-	nvmem-cells = <&mac_address>;
+	nvmem-cells = <&mac_address 3>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <3>;
 };
 
 &gmac {
 	status = "okay";
-	nvmem-cells = <&mac_address>;
+	nvmem-cells = <&mac_address 0>;
 	nvmem-cell-names = "mac-address";
 };