From 8b393f99fdb600ea936eee977ba024354275708c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 7 Apr 2026 21:20:00 -0700 Subject: [PATCH] ath79: move label-mac-device out of dtsi A script was ran that checks the label-mac-device node to see if it has nvmem definitions as label-mac-device requires nvmem. This is mostly a change to make the script happy. No indended functional difference. Add a change to qca9533_yuncore_cpe830.dts adding an nvmem definition to wmac. Seems to have been some kind of oversight where it's specified in nvmem but not used. label-mac-device needs an NVMEM definition. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/22907 Signed-off-by: Robert Marko --- .../linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts | 1 + target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi | 1 + target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi | 4 ---- target/linux/ath79/dts/ar9344_engenius_eap600.dts | 4 ++++ target/linux/ath79/dts/ar9344_engenius_ecb600.dts | 4 ++++ target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi | 1 - target/linux/ath79/dts/ar9344_watchguard_ap100.dts | 1 + target/linux/ath79/dts/ar9344_watchguard_ap200.dts | 1 + target/linux/ath79/dts/qca9533_yuncore_cpe830.dts | 6 +++--- target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts | 1 - target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 1 - target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi | 5 +++++ target/linux/ath79/dts/qca9563_zte_mf281.dts | 4 ++++ target/linux/ath79/dts/qca9563_zte_mf282.dts | 4 ++++ target/linux/ath79/dts/qca9563_zte_mf28x.dtsi | 1 - 15 files changed, 28 insertions(+), 11 deletions(-) diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts index e3c8f2a6099..354a25ac0a7 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap-outdoor-plus.dts @@ -11,6 +11,7 @@ led-failsafe = &led_white; led-running = &led_blue; led-upgrade = &led_blue; + label-mac-device = ð0; }; leds { diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi index e9abd423f57..f414d6465f5 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi-ap.dtsi @@ -8,6 +8,7 @@ led-failsafe = &led_dome_green; led-running = &led_dome_green; led-upgrade = &led_dome_green; + label-mac-device = ð0; }; leds { diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi index fa6c2337333..08f19418d53 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi +++ b/target/linux/ath79/dts/ar7241_ubnt_unifi.dtsi @@ -6,10 +6,6 @@ #include / { - aliases { - label-mac-device = ð0; - }; - keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/ar9344_engenius_eap600.dts b/target/linux/ath79/dts/ar9344_engenius_eap600.dts index 0cbddc529d9..410f41d0543 100644 --- a/target/linux/ath79/dts/ar9344_engenius_eap600.dts +++ b/target/linux/ath79/dts/ar9344_engenius_eap600.dts @@ -8,6 +8,10 @@ model = "EnGenius EAP600"; compatible = "engenius,eap600", "qca,ar9344"; + aliases { + label-mac-device = ð0; + }; + leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts index acfcafaa652..d35b58394d9 100644 --- a/target/linux/ath79/dts/ar9344_engenius_ecb600.dts +++ b/target/linux/ath79/dts/ar9344_engenius_ecb600.dts @@ -8,6 +8,10 @@ model = "EnGenius ECB600"; compatible = "engenius,ecb600", "qca,ar9344"; + aliases { + label-mac-device = ð0; + }; + leds { compatible = "gpio-leds"; diff --git a/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi b/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi index b64a552635c..d057a0ad5d8 100644 --- a/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi +++ b/target/linux/ath79/dts/ar9344_senao_ap-dual.dtsi @@ -8,7 +8,6 @@ / { aliases { - label-mac-device = ð0; led-boot = &led_power; led-failsafe = &led_power; led-running = &led_power; diff --git a/target/linux/ath79/dts/ar9344_watchguard_ap100.dts b/target/linux/ath79/dts/ar9344_watchguard_ap100.dts index 09626b93c12..c87c574f32b 100644 --- a/target/linux/ath79/dts/ar9344_watchguard_ap100.dts +++ b/target/linux/ath79/dts/ar9344_watchguard_ap100.dts @@ -13,6 +13,7 @@ led-failsafe = &led_power_amber; led-running = &led_power_green; led-upgrade = &led_power_amber; + label-mac-device = ð0; }; leds { diff --git a/target/linux/ath79/dts/ar9344_watchguard_ap200.dts b/target/linux/ath79/dts/ar9344_watchguard_ap200.dts index 8a05da966d5..828bbd5cae9 100644 --- a/target/linux/ath79/dts/ar9344_watchguard_ap200.dts +++ b/target/linux/ath79/dts/ar9344_watchguard_ap200.dts @@ -13,6 +13,7 @@ led-failsafe = &led_power_amber; led-running = &led_power_green; led-upgrade = &led_power_amber; + label-mac-device = ð0; }; leds { diff --git a/target/linux/ath79/dts/qca9533_yuncore_cpe830.dts b/target/linux/ath79/dts/qca9533_yuncore_cpe830.dts index de1a9b135e7..87948f59250 100644 --- a/target/linux/ath79/dts/qca9533_yuncore_cpe830.dts +++ b/target/linux/ath79/dts/qca9533_yuncore_cpe830.dts @@ -117,7 +117,7 @@ reg = <0x1000 0x440>; }; - macaddr_art_wmac: macaddr@1002 { + macaddr_art_1002: macaddr@1002 { reg = <0x1002 0x6>; }; }; @@ -141,8 +141,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/qca9557_zyxel_nbg6616.dts b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts index 96b7b69de68..808cf1a6f51 100644 --- a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts +++ b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts @@ -9,7 +9,6 @@ model = "Zyxel NBG6616"; aliases { - label-mac-device = &wmac; led-boot = &led_power; led-failsafe = &led_power; led-running = &led_power; diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts index 6bb4e98cd93..f113bd0d95e 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts +++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts @@ -9,7 +9,6 @@ model = "Zyxel NBG6716"; aliases { - label-mac-device = &wmac; led-boot = &led_power; led-failsafe = &led_power; led-running = &led_power; diff --git a/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi b/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi index 63b20b4725f..280ece859af 100644 --- a/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi +++ b/target/linux/ath79/dts/qca955x_zyxel_nbg6x16.dtsi @@ -6,6 +6,11 @@ #include / { + + aliases { + label-mac-device = &wmac; + }; + keys: keys { compatible = "gpio-keys"; diff --git a/target/linux/ath79/dts/qca9563_zte_mf281.dts b/target/linux/ath79/dts/qca9563_zte_mf281.dts index 06a8b2350ab..4da1d9f4fed 100644 --- a/target/linux/ath79/dts/qca9563_zte_mf281.dts +++ b/target/linux/ath79/dts/qca9563_zte_mf281.dts @@ -9,6 +9,10 @@ model = "ZTE MF281"; compatible = "zte,mf281", "qca,qca9563"; + aliases { + label-mac-device = ð0; + }; + leds { pinctrl-names = "default"; pinctrl-0 = <&enable_wlan_led_gpio>; diff --git a/target/linux/ath79/dts/qca9563_zte_mf282.dts b/target/linux/ath79/dts/qca9563_zte_mf282.dts index 12c8f00d1f3..7442feab960 100644 --- a/target/linux/ath79/dts/qca9563_zte_mf282.dts +++ b/target/linux/ath79/dts/qca9563_zte_mf282.dts @@ -10,6 +10,10 @@ model = "ZTE MF282"; compatible = "zte,mf282", "qca,qca9563"; + aliases { + label-mac-device = ð0; + }; + ubi-concat { compatible = "mtd-concat"; devices = <&ubiconcat0 &ubiconcat1>; diff --git a/target/linux/ath79/dts/qca9563_zte_mf28x.dtsi b/target/linux/ath79/dts/qca9563_zte_mf28x.dtsi index 1edcd7e5ea6..55c5792bac4 100644 --- a/target/linux/ath79/dts/qca9563_zte_mf28x.dtsi +++ b/target/linux/ath79/dts/qca9563_zte_mf28x.dtsi @@ -13,7 +13,6 @@ led-failsafe = &led_debug; led-running = &led_debug; led-upgrade = &led_debug; - label-mac-device = ð0; }; leds {