From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Sun, 21 Jan 2024 21:51:16 +0000 (-0500)
Subject: ath79: fix mac address on eap2x5-1port devices
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c527073b38bed10479ed258f964a2948d78c6624;p=openwrt%2Fstaging%2Fblocktrron.git

ath79: fix mac address on eap2x5-1port devices

Commit e816591e226a ("ath79: qca: convert to nvmem-layout") mistakenly
switched the source of the mac address from the 'info' to 'art'
partition.

This patch updates all devices that share same 'parent' device tree file
and was tested to fix the problem for eap225-outdoor-v3 - device that I
actually own.

Fixes: e816591e226a ("ath79: qca: convert to nvmem-layout")
Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
[amend commit message]
Signed-off-by: Sander Vanheule <sander@svanheule.net>
---

diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts
index 9c1e82bf98..c3f1a130eb 100644
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts
@@ -35,12 +35,6 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		macaddr_info_8: macaddr@8 {
-			compatible = "mac-base";
-			reg = <0x8 0x6>;
-			#nvmem-cell-cells = <1>;
-		};
-
 		precalibration_ath10k: pre-calibration@5000 {
 			reg = <0x5000 0x2f20>;
 		};
diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
index 73700b626f..1fac6082cf 100644
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
@@ -35,12 +35,6 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		macaddr_info_8: macaddr@8 {
-			compatible = "mac-base";
-			reg = <0x8 0x6>;
-			#nvmem-cell-cells = <1>;
-		};
-
 		precalibration_ath10k: pre-calibration@5000 {
 			reg = <0x5000 0x2f20>;
 		};
diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
index 1e100b31a7..9d06a49626 100644
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts
@@ -56,12 +56,6 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		macaddr_info_8: macaddr@8 {
-			compatible = "mac-base";
-			reg = <0x8 0x6>;
-			#nvmem-cell-cells = <1>;
-		};
-
 		calibration_ath10k: calibration@5000 {
 			reg = <0x5000 0x844>;
 		};
diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
index 32fba98051..5139bc7670 100644
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts
@@ -35,12 +35,6 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		macaddr_info_8: macaddr@8 {
-			compatible = "mac-base";
-			reg = <0x8 0x6>;
-			#nvmem-cell-cells = <1>;
-		};
-
 		precalibration_ath10k: pre-calibration@5000 {
 			reg = <0x5000 0x2f20>;
 		};
diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts
index 1c48775cdf..6e7ba5fede 100644
--- a/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts
@@ -35,12 +35,6 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		macaddr_info_8: macaddr@8 {
-			compatible = "mac-base";
-			reg = <0x8 0x6>;
-			#nvmem-cell-cells = <1>;
-		};
-
 		precalibration_ath10k: pre-calibration@5000 {
 			reg = <0x5000 0x2f20>;
 		};
diff --git a/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts
index e7f21fafa5..af133813e7 100644
--- a/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts
+++ b/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts
@@ -49,12 +49,6 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		macaddr_info_8: macaddr@8 {
-			compatible = "mac-base";
-			reg = <0x8 0x6>;
-			#nvmem-cell-cells = <1>;
-		};
-
 		calibration_ath10k: calibration@5000 {
 			reg = <0x5000 0x844>;
 		};
diff --git a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
index 9e0b97fcbf..3b36049d5e 100644
--- a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
+++ b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi
@@ -55,6 +55,18 @@
 				label = "info";
 				reg = <0x030000 0x010000>;
 				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_info_8: macaddr@8 {
+						compatible = "mac-base";
+						reg = <0x8 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+				};
 			};
 
 			partition@40000 {