[openwrt/openwrt] ipq40xx: fix wlan mac address for Aruba AP-303H

[LEDE Commits]

ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/1036545b0026dbf30da0c805d9c639bb688fa8e5

commit 1036545b0026dbf30da0c805d9c639bb688fa8e5
Author: Bjoern Dobe <bjoern at dobecom.de>
AuthorDate: Thu Dec 29 18:19:37 2022 +0100

    ipq40xx: fix wlan mac address for Aruba AP-303H
    
    Assigns the correct mac address from nvmen to the wlan interfaces.
    This Mac address corresponds to the label "Wireless MAC" on the device
    and the stock firmware.
    Removes duplicate entry of calibration variant for both radios.
    
    Fixes: cfc13c44595d ("ipq40xx: utilize nvmem-cells for macs & (pre-)calibration data")
    Reviewed-by: Robert Marko <robimarko at gmail.com>
    Signed-off-by: Bjoern Dobe <bjoern at dobecom.de>
---
 .../ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts
index fba6209d99..86f4514317 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-303h.dts
@@ -359,6 +359,10 @@
 				macaddr_mfginfo_1d: macaddr at 1d {
 					reg = <0x1d 0x6>;
 				};
+
+				macaddr_mfginfo_45: macaddr at 45 {
+					reg = <0x45 0x6>;
+				};
 			};
 
 			partition at 3a0000 {
@@ -454,17 +458,15 @@
 
 &wifi0 {
 	status = "okay";
-	qcom,ath10k-calibration-variant = "Aruba-AP-303";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_1d>;
+	nvmem-cells = <&precal_art_1000>, <&macaddr_mfginfo_45>;
 	qcom,ath10k-calibration-variant = "Aruba-AP-303";
 };
 
 &wifi1 {
 	status = "okay";
-	qcom,ath10k-calibration-variant = "Aruba-AP-303";
 	nvmem-cell-names = "pre-calibration", "mac-address";
-	nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_1d>;
+	nvmem-cells = <&precal_art_5000>, <&macaddr_mfginfo_45>;
 	mac-address-increment = <1>;
 	qcom,ath10k-calibration-variant = "Aruba-AP-303";
 };