From f70e786a7ceee494b6b868cc186ed1e311f28775 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Wed, 3 Dec 2025 19:15:05 -0800 Subject: [PATCH] ath79: fix label-mac-device for wmac It appears 683-of_net-add-mac-address-to-of-tree.patch relies on the mac-address nvmem property being present. wmac itself doesn't need it as it takes it from the eeprom but label-mac-device needs it. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/21035 Signed-off-by: Hauke Mehrtens --- target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi | 8 ++++++-- .../linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts | 8 ++++++-- target/linux/ath79/dts/ar9342_ubnt_xw.dtsi | 8 ++++++-- target/linux/ath79/dts/ar9344_alfa-network_n5q.dts | 8 ++++++-- target/linux/ath79/dts/ar9344_longdata_aps256.dts | 4 ++-- target/linux/ath79/dts/qca9531_8dev_carambola3.dts | 8 ++++++-- target/linux/ath79/dts/qca9531_alcatel_hh40v.dts | 8 ++++++-- target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi | 4 ++-- target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts | 8 ++++++-- 9 files changed, 46 insertions(+), 18 deletions(-) diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi index 94039303414..3f64b261840 100644 --- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi +++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi @@ -109,6 +109,10 @@ macaddr_art_0: macaddr@0 { reg = <0x0 0x6>; }; + + macaddr_art_1002: macaddr@1002 { + reg = <0x1002 0x6>; + }; }; }; @@ -132,8 +136,8 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>; - nvmem-cell-names = "calibration"; + nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>; + nvmem-cell-names = "calibration", "mac-address"; led { led-sources = <0>; diff --git a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts index d423edccf27..e5c4cc01fbb 100644 --- a/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts +++ b/target/linux/ath79/dts/ar9331_hak5_wifi-pineapple-nano.dts @@ -116,6 +116,10 @@ cal_art_1000: calibration@1000 { reg = <0x1000 0x440>; }; + + macaddr_art_1002: macaddr@1002 { + reg = <0x1002 0x6>; + }; }; }; }; @@ -135,6 +139,6 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>; - nvmem-cell-names = "calibration"; + nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>; + nvmem-cell-names = "calibration", "mac-address"; }; diff --git a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi index 385eb95638a..028c543e3cc 100644 --- a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi +++ b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi @@ -79,6 +79,10 @@ calibration_art_1000: calibration@1000 { reg = <0x1000 0x440>; }; + + macaddr_art_1002: macaddr@1002 { + reg = <0x1002 0x6>; + }; }; }; }; @@ -88,8 +92,8 @@ &wmac { status = "okay"; - nvmem-cells = <&calibration_art_1000>; - nvmem-cell-names = "calibration"; + nvmem-cells = <&calibration_art_1000>, <&macaddr_art_1002>; + nvmem-cell-names = "calibration", "mac-address"; }; ð0 { diff --git a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts index 31d18d80ed3..30cb50d5be1 100644 --- a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts +++ b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts @@ -146,6 +146,10 @@ macaddr_art_6: macaddr@6 { reg = <0x6 0x6>; }; + + macaddr_art_1002: macaddr@1002 { + reg = <0x1002 0x6>; + }; }; }; @@ -165,8 +169,8 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>; - nvmem-cell-names = "calibration"; + nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>; + nvmem-cell-names = "calibration", "mac-address"; led { led-sources = <12>; diff --git a/target/linux/ath79/dts/ar9344_longdata_aps256.dts b/target/linux/ath79/dts/ar9344_longdata_aps256.dts index 5c0ba9bde02..a8ee61a0039 100644 --- a/target/linux/ath79/dts/ar9344_longdata_aps256.dts +++ b/target/linux/ath79/dts/ar9344_longdata_aps256.dts @@ -129,8 +129,8 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>; - nvmem-cell-names = "calibration"; + nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002 0>; + nvmem-cell-names = "calibration", "mac-address"; led { led-sources = <13>; diff --git a/target/linux/ath79/dts/qca9531_8dev_carambola3.dts b/target/linux/ath79/dts/qca9531_8dev_carambola3.dts index f34c9e744e4..91b1872f4f6 100644 --- a/target/linux/ath79/dts/qca9531_8dev_carambola3.dts +++ b/target/linux/ath79/dts/qca9531_8dev_carambola3.dts @@ -87,6 +87,10 @@ cal_art_1000: calibration@1000 { reg = <0x1000 0x440>; }; + + macaddr_art_1002: macaddr@1002 { + reg = <0x1002 0x6>; + }; }; }; @@ -127,6 +131,6 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>; - nvmem-cell-names = "calibration"; + nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>; + nvmem-cell-names = "calibration", "mac-address"; }; diff --git a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts index 1d64c708597..69d7362fd19 100644 --- a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts +++ b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts @@ -132,6 +132,10 @@ macaddr_art_6: macaddr@6 { reg = <0x6 0x6>; }; + + macaddr_art_1002: macaddr@1002 { + reg = <0x1002 0x6>; + }; }; }; }; @@ -162,8 +166,8 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>; - nvmem-cell-names = "calibration"; + nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>; + nvmem-cell-names = "calibration", "mac-address"; led { led-sources = <0>; diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi index f5145b521cb..f5ee8975c7a 100644 --- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi +++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi @@ -127,6 +127,6 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>; - nvmem-cell-names = "calibration"; + nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002 0>; + nvmem-cell-names = "calibration", "mac-address"; }; diff --git a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts index b6e6fc91dfe..72654633dbf 100644 --- a/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts +++ b/target/linux/ath79/dts/qca9533_ubnt_aircube-isp.dts @@ -83,6 +83,10 @@ cal_art_1000: calibration@1000 { reg = <0x1000 0x440>; }; + + macaddr_art_1002: macaddr@1002 { + reg = <0x1002 0x6>; + }; }; }; }; @@ -110,6 +114,6 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>; - nvmem-cell-names = "calibration"; + nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>; + nvmem-cell-names = "calibration", "mac-address"; };