[openwrt/openwrt] ath79: replace various mtd_get_mac_text
LEDE Commits
lede-commits at lists.infradead.org
Tue Sep 30 02:21:25 PDT 2025
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/6157a2aeb96ca92f2dbab94d67020d1e7eb912e2
commit 6157a2aeb96ca92f2dbab94d67020d1e7eb912e2
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Thu Jun 13 17:19:07 2024 -0700
ath79: replace various mtd_get_mac_text
Deprecated. Replaced with nvmem.
Signed-off-by: Rosen Penev <rosenp at gmail.com>
Link: https://github.com/openwrt/openwrt/pull/20176
Signed-off-by: Robert Marko <robimarko at gmail.com>
---
target/linux/ath79/dts/ar9342_zyxel_nwa1123-ac.dts | 7 ++++++
target/linux/ath79/dts/ar9342_zyxel_nwa1123-ni.dts | 7 ++++++
.../linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts | 26 ++++++++++++++++++++--
target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi | 26 ++++++++++++++++++++--
.../generic/base-files/etc/board.d/02_network | 6 -----
.../etc/hotplug.d/ieee80211/10_fix_wifi_mac | 13 -----------
6 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/target/linux/ath79/dts/ar9342_zyxel_nwa1123-ac.dts b/target/linux/ath79/dts/ar9342_zyxel_nwa1123-ac.dts
index e3164259df..dc0b25e8e8 100644
--- a/target/linux/ath79/dts/ar9342_zyxel_nwa1123-ac.dts
+++ b/target/linux/ath79/dts/ar9342_zyxel_nwa1123-ac.dts
@@ -36,4 +36,11 @@
&pcie {
status = "okay";
+
+ wifi at 0,0 {
+ compatible = "qcom,ath10k";
+ reg = <0x0000 0 0 0 0>;
+ nvmem-cells = <&macaddr_mib0_66 0>;
+ nvmem-cell-names = "mac-address";
+ };
};
diff --git a/target/linux/ath79/dts/ar9342_zyxel_nwa1123-ni.dts b/target/linux/ath79/dts/ar9342_zyxel_nwa1123-ni.dts
index cb5588c122..c27b0e5aa4 100644
--- a/target/linux/ath79/dts/ar9342_zyxel_nwa1123-ni.dts
+++ b/target/linux/ath79/dts/ar9342_zyxel_nwa1123-ni.dts
@@ -36,4 +36,11 @@
&pcie {
status = "okay";
+
+ wifi at 0,0 {
+ compatible = "pci168c,0030";
+ reg = <0x0000 0 0 0 0>;
+ nvmem-cells = <&macaddr_mib0_66 0>;
+ nvmem-cell-names = "mac-address";
+ };
};
diff --git a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
index 198b08c56e..a77c4b7a89 100644
--- a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
+++ b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
@@ -11,6 +11,7 @@
model = "D-Link DCH-G020 A1";
aliases {
+ label-mac-device = ð0;
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
@@ -129,6 +130,24 @@
label = "mp";
reg = <0x20000 0x10000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_mp_1: macaddr at 1 {
+ compatible = "mac-base";
+ reg = <0x1 0x11>;
+ #nvmem-cell-cells = <1>;
+ };
+
+ macaddr_mp_13: macaddr at 13 {
+ compatible = "mac-base";
+ reg = <0x13 0x11>;
+ #nvmem-cell-cells = <1>;
+ };
+ };
};
partition at 30000 {
@@ -168,11 +187,14 @@
ð0 {
status = "okay";
+
+ nvmem-cells = <&macaddr_mp_1 0>;
+ nvmem-cell-names = "mac-address";
};
&wmac {
status = "okay";
- nvmem-cells = <&cal_art_1000>;
- nvmem-cell-names = "calibration";
+ nvmem-cells = <&cal_art_1000>, <&macaddr_mp_13 0>;
+ nvmem-cell-names = "calibration", "mac-address";
};
diff --git a/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi b/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
index 0364cf2cd7..be21bedbf8 100644
--- a/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
+++ b/target/linux/ath79/dts/qca9533_dlink_dap-13xx.dtsi
@@ -8,6 +8,7 @@
/ {
aliases {
+ label-mac-device = ð0;
led-boot = &led_power;
led-failsafe = &led_status;
led-running = &led_power;
@@ -106,6 +107,24 @@
label = "mp";
reg = <0x20000 0x10000>;
read-only;
+
+ nvmem-layout {
+ compatible = "fixed-layout";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ macaddr_mp_1: macaddr at 1 {
+ compatible = "mac-base";
+ reg = <0x1 0x11>;
+ #nvmem-cell-cells = <1>;
+ };
+
+ macaddr_mp_13: macaddr at 13 {
+ compatible = "mac-base";
+ reg = <0x13 0x11>;
+ #nvmem-cell-cells = <1>;
+ };
+ };
};
partition at 30000 {
@@ -125,11 +144,14 @@
ð0 {
status = "okay";
+
+ nvmem-cells = <&macaddr_mp_1 0>;
+ nvmem-cell-names = "mac-address";
};
&wmac {
status = "okay";
- nvmem-cells = <&cal_art_1000>;
- nvmem-cell-names = "calibration";
+ nvmem-cells = <&cal_art_1000>, <&macaddr_mp_13 0>;
+ nvmem-cell-names = "calibration", "mac-address";
};
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index 30ee6405b1..d1ba702340 100644
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -689,12 +689,6 @@ ath79_setup_macs()
plc_mac=$(mtd_get_mac_ascii art "protest_plc_mac")
[ -n "$plc_mac" ] && ucidef_set_interface_macaddr "plc" $plc_mac
;;
- dlink,dap-1330-a1|\
- dlink,dap-1365-a1|\
- dlink,dch-g020-a1)
- lan_mac=$(mtd_get_mac_text "mp" 0x1)
- label_mac=$lan_mac
- ;;
dlink,dap-2230-a1|\
dlink,dap-2660-a1|\
dlink,dap-2680-a1|\
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
index c4ae1c46b9..f30cc43816 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
@@ -24,11 +24,6 @@ case "$board" in
[ "$PHYNBR" -eq 1 ] && \
mtd_get_mac_ascii art "protest_ath0_mac" > /sys${DEVPATH}/macaddress
;;
- dlink,dap-1330-a1|\
- dlink,dap-1365-a1|\
- dlink,dch-g020-a1)
- mtd_get_mac_text "mp" 0x13 > /sys${DEVPATH}/macaddress
- ;;
dlink,dap-2230-a1|\
dlink,dap-3320-a1)
mtd_get_mac_ascii bdcfg "wlanmac" > /sys${DEVPATH}/macaddress
@@ -127,12 +122,4 @@ case "$board" in
[ "$PHYNBR" -eq 1 ] && \
mtd_get_mac_ascii devdata wlan5mac > /sys${DEVPATH}/macaddress
;;
- zyxel,nwa1123-ac)
- [ "$PHYNBR" -eq 0 ] && \
- mtd_get_mac_text mib0 0x66 > /sys${DEVPATH}/macaddress
- ;;
- zyxel,nwa1123-ni)
- [ "$PHYNBR" -eq 1 ] && \
- mtd_get_mac_text mib0 0x66 > /sys${DEVPATH}/macaddress
- ;;
esac
More information about the lede-commits
mailing list