[openwrt/openwrt] ath79: pqi-air-pen: adjust mac addresses

[LEDE Commits]

blogic pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/c90842b0d1b228df2986ec483ce692db2e7c3032

commit c90842b0d1b228df2986ec483ce692db2e7c3032
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Mon Nov 25 14:33:06 2024 -0800

    ath79: pqi-air-pen: adjust mac addresses
    
    The original ar71xx version of this device used 1002 as mac address for
    both ethernet and wireless. The ath79 version inexplicably changes this
    to 2, which seems to be done nowhere else in ath79, indicating it's
    bogus.
    
    Restore previous ar71xx assignment. 1002 is used as an ethernet
    interface with some other devices as well.
    
    Also remove the bogus caldata userspace extraction. The size is bogus
    and it's already handled in dts.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/17083
    Signed-off-by: John Crispin <john at phrozen.org>
---
 target/linux/ath79/dts/ar9330_pqi_air-pen.dts                     | 8 ++------
 .../ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom  | 3 ---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
index 121dcbcb0e..4153de571a 100644
--- a/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
+++ b/target/linux/ath79/dts/ar9330_pqi_air-pen.dts
@@ -95,10 +95,6 @@
 					#address-cells = <1>;
 					#size-cells = <1>;
 
-					macaddr_art_2: macaddr at 2 {
-						reg = <0x2 0x6>;
-					};
-
 					cal_art_1000: calibration at 1000 {
 						reg = <0x1000 0x440>;
 					};
@@ -153,6 +149,6 @@
 &wmac {
 	status = "okay";
 
-	nvmem-cells = <&macaddr_art_2>, <&cal_art_1000>;
-	nvmem-cell-names = "mac-address", "calibration";
+	nvmem-cells = <&cal_art_1000>;
+	nvmem-cell-names = "calibration";
 };
diff --git a/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index d424b9fe2c..796ebc3321 100644
--- a/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -46,9 +46,6 @@ case "$FIRMWARE" in
 	ubnt,picostation-m)
 		caldata_extract "art" 0x1000 0x1000
 		;;
-	pqi,air-pen)
-		caldata_extract "art" 0x1000 0x7d2
-		;;
 	*)
 		caldata_die "board $board is not supported yet"
 		;;