ipq806x: remove mac-address-increment

It's deprecated. Signed-off-by: Rosen Penev <rosenp@gmail.com>
db260179 · Nov 21, 2023 · d264d3a · d264d3a
1 parent 659f2d7
commit d264d3a
Show file tree

Hide file tree

Showing 17 changed files with 319 additions and 291 deletions.
diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8062-wg2600hp3.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8062-wg2600hp3.dts
@@ -319,22 +319,47 @@
 					label = "PRODUCTDATA";
 					reg = <0x02b0000 0x0030000>;
 					read-only;
+
+					nvmem-layout {
+						compatible = "fixed-layout";
+						#address-cells = <1>;
+						#size-cells = <1>;
+
+						macaddr_factory_0: macaddr@0 {
+							reg = <0x0 0x6>;
+						};
+
+						macaddr_factory_6: macaddr@6 {
+							reg = <0x6 0x6>;
+						};
+
+						macaddr_PRODUCTDATA_c: macaddr@c {
+							reg = <0xc 0x6>;
+						};
+
+						macaddr_PRODUCTDATA_12: macaddr@12 {
+							reg = <0x12 0x6>;
+						};
+					};
 				};
 
 				partition@2e0000 {
 					label = "ART";
 					reg = <0x02e0000 0x0040000>;
 					read-only;
-					compatible = "nvmem-cells";
-					#address-cells = <1>;
-					#size-cells = <1>;
 
-					precal_ART_1000: precal@1000 {
-						reg = <0x1000 0x2f20>;
-					};
+					nvmem-layout {
+						compatible = "fixed-layout";
+						#address-cells = <1>;
+						#size-cells = <1>;
 
-					precal_ART_5000: precal@5000 {
-						reg = <0x5000 0x2f20>;
+						precal_ART_1000: precal@1000 {
+							reg = <0x1000 0x2f20>;
+						};
+
+						precal_ART_5000: precal@5000 {
+							reg = <0x5000 0x2f20>;
+						};
 					};
 				};
 
@@ -691,28 +716,6 @@
 	};
 };
 
-&factory {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_factory_0: macaddr@0 {
-		reg = <0x0 0x6>;
-	};
-
-	macaddr_factory_6: macaddr@6 {
-		reg = <0x6 0x6>;
-	};
-
-	macaddr_PRODUCTDATA_c: macaddr@c {
-		reg = <0xc 0x6>;
-	};
-
-	macaddr_PRODUCTDATA_12: macaddr@12 {
-		reg = <0x12 0x6>;
-	};
-};
-
 &hs_phy_0 {
 	status = "okay";
 };

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi
@@ -162,16 +162,19 @@
 					label = "radio";
 					reg = <0x1b0000 0x40000>;
 					read-only;
-					compatible = "nvmem-cells";
-					#address-cells = <1>;
-					#size-cells = <1>;
 
-					precal_radio_1000: precal@1000 {
-						reg = <0x1000 0x2f20>;
-					};
+					nvmem-layout {
+						compatible = "fixed-layout";
+						#address-cells = <1>;
+						#size-cells = <1>;
+
+						precal_radio_1000: precal@1000 {
+							reg = <0x1000 0x2f20>;
+						};
 
-					precal_radio_5000: precal@5000 {
-						reg = <0x5000 0x2f20>;
+						precal_radio_5000: precal@5000 {
+							reg = <0x5000 0x2f20>;
+						};
 					};
 				};
 
@@ -189,6 +192,18 @@
 					label = "default-mac";
 					reg = <0x1ef0000 0x00200>;
 					read-only;
+
+					nvmem-layout {
+						compatible = "fixed-layout";
+						#address-cells = <1>;
+						#size-cells = <1>;
+
+						macaddr_defaultmac_8: macaddr@8 {
+							compatible = "mac-base";
+							reg = <0x8 0x6>;
+							#nvmem-cell-cells = <1>;
+						};
+					};
 				};
 
 				partition@1ef0200 {
@@ -304,9 +319,8 @@
 			compatible = "pci168c,0040";
 			reg = <0x00010000 0 0 0 0>;
 
-			nvmem-cells = <&macaddr_defaultmac_8>, <&precal_radio_1000>;
+			nvmem-cells = <&macaddr_defaultmac_8 (-1)>, <&precal_radio_1000>;
 			nvmem-cell-names = "mac-address", "pre-calibration";
-			mac-address-increment = <(-1)>;
 		};
 	};
 };
@@ -325,7 +339,7 @@
 			compatible = "pci168c,0040";
 			reg = <0x00010000 0 0 0 0>;
 
-			nvmem-cells = <&macaddr_defaultmac_8>, <&precal_radio_5000>;
+			nvmem-cells = <&macaddr_defaultmac_8 0>, <&precal_radio_5000>;
 			nvmem-cell-names = "mac-address", "pre-calibration";
 		};
 	};
@@ -445,9 +459,8 @@
 	pinctrl-0 = <&rgmii2_pins>;
 	pinctrl-names = "default";
 
-	nvmem-cells = <&macaddr_defaultmac_8>;
+	nvmem-cells = <&macaddr_defaultmac_8 1>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <1>;
 
 	fixed-link {
 		speed = <1000>;
@@ -460,7 +473,7 @@
 	phy-mode = "sgmii";
 	qcom,id = <2>;
 
-	nvmem-cells = <&macaddr_defaultmac_8>;
+	nvmem-cells = <&macaddr_defaultmac_8 0>;
 	nvmem-cell-names = "mac-address";
 
 	fixed-link {
@@ -472,13 +485,3 @@
 &adm_dma {
 	status = "okay";
 };
-
-&defaultmac {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_defaultmac_8: macaddr@8 {
-		reg = <0x8 0x6>;
-	};
-};
diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
@@ -209,9 +209,8 @@
 			compatible = "pci168c,0040";
 			reg = <0x00010000 0 0 0 0>;
 
-			nvmem-cells = <&macaddr_art_6>, <&precal_art_1000>;
+			nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
 			nvmem-cell-names = "mac-address", "pre-calibration";
-			mac-address-increment = <(1)>;
 		};
 	};
 };
@@ -233,9 +232,8 @@
 			compatible = "pci168c,0040";
 			reg = <0x00010000 0 0 0 0>;
 
-			nvmem-cells = <&macaddr_art_6>, <&precal_art_5000>;
+			nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
 			nvmem-cell-names = "mac-address", "pre-calibration";
-			mac-address-increment = <(2)>;
 		};
 	};
 };
@@ -288,24 +286,29 @@
 				label = "art";
 				reg = <0x1200000 0x0140000>;
 				read-only;
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
 
-				macaddr_art_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_art_6: macaddr@6 {
-					reg = <0x6 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				precal_art_1000: precal@1000 {
-					reg = <0x1000 0x2f20>;
-				};
+					macaddr_art_6: macaddr@6 {
+						compatible = "mac-base";
+						reg = <0x6 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+
+					precal_art_1000: precal@1000 {
+						reg = <0x1000 0x2f20>;
+					};
 
-				precal_art_5000: precal@5000 {
-					reg = <0x5000 0x2f20>;
+					precal_art_5000: precal@5000 {
+						reg = <0x5000 0x2f20>;
+					};
 				};
 			};
 
@@ -448,7 +451,7 @@
 	pinctrl-0 = <&rgmii2_pins>;
 	pinctrl-names = "default";
 
-	nvmem-cells = <&macaddr_art_6>;
+	nvmem-cells = <&macaddr_art_6 0>;
 	nvmem-cell-names = "mac-address";
 
 	fixed-link {

diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -221,6 +221,20 @@
 				label = "art";
 				reg = <0x1200000 0x0140000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
+
+					macaddr_art_6: macaddr@6 {
+						reg = <0x6 0x6>;
+					};
+				};
 			};
 
 			kernel@1340000 {
@@ -393,17 +407,3 @@
 &adm_dma {
 	status = "okay";
 };
-
-&art {
-	compatible = "nvmem-cells";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	macaddr_art_0: macaddr@0 {
-		reg = <0x0 0x6>;
-	};
-
-	macaddr_art_6: macaddr@6 {
-		reg = <0x6 0x6>;
-	};
-};
diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
@@ -213,9 +213,8 @@
 			compatible = "pci168c,0040";
 			reg = <0x00010000 0 0 0 0>;
 
-			nvmem-cells = <&macaddr_art_6>, <&precal_art_1000>;
+			nvmem-cells = <&macaddr_art_6 1>, <&precal_art_1000>;
 			nvmem-cell-names = "mac-address", "pre-calibration";
-			mac-address-increment = <(1)>;
 		};
 	};
 };
@@ -237,9 +236,8 @@
 			compatible = "pci168c,0040";
 			reg = <0x00010000 0 0 0 0>;
 
-			nvmem-cells = <&macaddr_art_6>, <&precal_art_5000>;
+			nvmem-cells = <&macaddr_art_6 2>, <&precal_art_5000>;
 			nvmem-cell-names = "mac-address", "pre-calibration";
-			mac-address-increment = <(2)>;
 		};
 	};
 };
@@ -285,24 +283,29 @@
 				label = "art";
 				reg = <0x1200000 0x0140000>;
 				read-only;
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
 
-				macaddr_art_0: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				macaddr_art_6: macaddr@6 {
-					reg = <0x6 0x6>;
-				};
+					macaddr_art_0: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
 
-				precal_art_1000: precal@1000 {
-					reg = <0x1000 0x2f20>;
-				};
+					macaddr_art_6: macaddr@6 {
+						compatible = "mac-base";
+						reg = <0x6 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+
+					precal_art_1000: precal@1000 {
+						reg = <0x1000 0x2f20>;
+					};
 
-				precal_art_5000: precal@5000 {
-					reg = <0x5000 0x2f20>;
+					precal_art_5000: precal@5000 {
+						reg = <0x5000 0x2f20>;
+					};
 				};
 			};
 
@@ -445,7 +448,7 @@
 	pinctrl-0 = <&rgmii2_pins>;
 	pinctrl-names = "default";
 
-	nvmem-cells = <&macaddr_art_6>;
+	nvmem-cells = <&macaddr_art_6 0>;
 	nvmem-cell-names = "mac-address";
 
 	fixed-link {