[openwrt/openwrt] ath79: gl-e750: use nvmem for mac addresses

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/477c8a5101f0a6215201d66be25cf11e9803fe2b

commit 477c8a5101f0a6215201d66be25cf11e9803fe2b
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Sun Jun 16 12:48:40 2024 -0700

    ath79: gl-e750: use nvmem for mac addresses
    
    This is a simple conversion to dts.
    
    68ac3f2cddab states that the 5ghz wifi address is calculated from ART 0
    + 2.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/17066
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 target/linux/ath79/dts/qca9531_glinet_gl-e750.dts             | 11 ++++++++++-
 .../nand/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac   |  5 -----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
index ba12915570..e4b5f1ea6c 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-e750.dts
@@ -45,6 +45,13 @@
 
 &pcie0 {
 	status = "okay";
+
+	wifi at 0,0 {
+		compatible = "qcom,ath10k";
+		reg = <0x0000 0 0 0 0>;
+		nvmem-cells = <&macaddr_art_0 2>;
+		nvmem-cell-names = "mac-address";
+	};
 };
 
 &usb0 {
@@ -90,7 +97,9 @@
 					#size-cells = <1>;
 
 					macaddr_art_0: macaddr at 0 {
+						compatible = "mac-base";
 						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
 					};
 
 					cal_art_1000: calibration at 1000 {
@@ -134,7 +143,7 @@
 
 	phy-handle = <&swphy4>;
 
-	nvmem-cells = <&macaddr_art_0>;
+	nvmem-cells = <&macaddr_art_0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac b/target/linux/ath79/nand/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac
index 5a933df501..989791b64f 100644
--- a/target/linux/ath79/nand/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac
+++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/ieee80211/10-fix-wifi-mac
@@ -10,11 +10,6 @@ PHYNBR=${DEVPATH##*/phy}
 board=$(board_name)
 
 case $board in
-	glinet,gl-e750)
-		# Set mac address for 5g device
-		[ "$PHYNBR" -eq 0 ] && \
-			macaddr_add $(mtd_get_mac_binary art 0x0) 2 > /sys${DEVPATH}/macaddress
-		;;
 	zyxel,emg2926-q10a|\
 	zyxel,nbg6716)
 		ethaddr=$(mtd_get_mac_ascii u-boot-env ethaddr)