Browse Source

qualcommax: convert to nvmem-layout

nvmem-cells is deprecated

Signed-off-by: Rosen Penev <[email protected]>
Rosen Penev 2 years ago
parent
commit
eadf2ead4e

+ 24 - 22
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi

@@ -151,28 +151,30 @@
 				reg = <0x800000 0x80000>;
 				read-only;
 
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				macaddr_dp2: macaddr@6 {
-					reg = <0x6 0x6>;
-				};
-
-				macaddr_dp3: macaddr@c {
-					reg = <0xc 0x6>;
-				};
-
-				macaddr_dp4: macaddr@12 {
-					reg = <0x12 0x6>;
-				};
-
-				macaddr_dp5: macaddr@18 {
-					reg = <0x18 0x6>;
-				};
-
-				caldata_qca9889: caldata@4d000 {
-					reg = <0x33000 0x844>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_dp2: macaddr@6 {
+						reg = <0x6 0x6>;
+					};
+
+					macaddr_dp3: macaddr@c {
+						reg = <0xc 0x6>;
+					};
+
+					macaddr_dp4: macaddr@12 {
+						reg = <0x12 0x6>;
+					};
+
+					macaddr_dp5: macaddr@18 {
+						reg = <0x18 0x6>;
+					};
+
+					caldata_qca9889: caldata@4d000 {
+						reg = <0x33000 0x844>;
+					};
 				};
 			};
 

+ 28 - 26
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts

@@ -280,32 +280,34 @@
 				reg = <0xf80000 0x80000>;
 				read-only;
 
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				macaddr_dp1: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
-
-				macaddr_dp2: macaddr@6 {
-					reg = <0x6 0x6>;
-				};
-
-				macaddr_dp3: macaddr@c {
-					reg = <0xc 0x6>;
-				};
-
-				macaddr_dp4: macaddr@12 {
-					reg = <0x12 0x6>;
-				};
-
-				macaddr_dp5: macaddr@18 {
-					reg = <0x18 0x6>;
-				};
-
-				caldata_qca9889: caldata@4d000 {
-					reg = <0x4d000 0x844>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_dp1: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
+
+					macaddr_dp2: macaddr@6 {
+						reg = <0x6 0x6>;
+					};
+
+					macaddr_dp3: macaddr@c {
+						reg = <0xc 0x6>;
+					};
+
+					macaddr_dp4: macaddr@12 {
+						reg = <0x12 0x6>;
+					};
+
+					macaddr_dp5: macaddr@18 {
+						reg = <0x18 0x6>;
+					};
+
+					caldata_qca9889: caldata@4d000 {
+						reg = <0x4d000 0x844>;
+					};
 				};
 			};
 

+ 28 - 27
target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts

@@ -441,34 +441,35 @@
 				reg = <0x1180000 0x0100000>;
 				read-only;
 
-				compatible = "nvmem-cells";
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				macaddr_dp1: macaddr@0 {
-					reg = <0x0 0x6>;
-				};
-
-				macaddr_dp2: macaddr@1 {
-					reg = <0x6 0x6>;
-				};
-
-				macaddr_dp3: macaddr@2 {
-					reg = <0xc 0x6>;
-				};
-
-				macaddr_dp4: macaddr@3 {
-					reg = <0x12 0x6>;
-				};
-
-				macaddr_dp5: macaddr@4 {
-					reg = <0x18 0x6>;
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_dp1: macaddr@0 {
+						reg = <0x0 0x6>;
+					};
+
+					macaddr_dp2: macaddr@1 {
+						reg = <0x6 0x6>;
+					};
+
+					macaddr_dp3: macaddr@2 {
+						reg = <0xc 0x6>;
+					};
+
+					macaddr_dp4: macaddr@3 {
+						reg = <0x12 0x6>;
+					};
+
+					macaddr_dp5: macaddr@4 {
+						reg = <0x18 0x6>;
+					};
+
+					macaddr_dp6_syn: macaddr@5 {
+						reg = <0x1e 0x6>;
+					};
 				};
-
-				macaddr_dp6_syn: macaddr@5 {
-					reg = <0x1e 0x6>;
-				};
-
 			};
 
 			partition@1280000 {