From c25e3275acc745e80c2868edbed7de2a7301372a Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 27 Sep 2020 15:51:18 +0200 Subject: [PATCH] ath79: fix LED labels for PowerCloud CAP324 The order of function and color in the labels in inverted for the LAN LEDs. Fix it. Fixes: 915966d86121 ("ath79: Port PowerCloud Systems CAP324 support") Signed-off-by: Adrian Schmutzler (cherry picked from commit 96023cd4ba66c33e77d9df562dda44b0a1ba1ac9) --- target/linux/ath79/base-files/etc/board.d/01_leds | 2 +- .../linux/ath79/base-files/etc/uci-defaults/04_led_migration | 3 +++ target/linux/ath79/dts/ar9344_pcs_cap324.dts | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds b/target/linux/ath79/base-files/etc/board.d/01_leds index 8c80a9eaa5..dd0f91affa 100755 --- a/target/linux/ath79/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/base-files/etc/board.d/01_leds @@ -91,7 +91,7 @@ on,n150r) ucidef_set_led_switch "lan2" "LAN2" "netgear:green:lan2" "switch0" "0x04" "0x0f" ;; pcs,cap324) - ucidef_set_led_netdev "lan" "LAN" "pcs:lan:green" "eth0" + ucidef_set_led_netdev "lan" "LAN" "pcs:green:lan" "eth0" ;; pcs,cr3000) ucidef_set_led_netdev "wan" "WAN" "pcs:blue:wan" "eth1" diff --git a/target/linux/ath79/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/base-files/etc/uci-defaults/04_led_migration index 561aa897f4..02b4bff342 100644 --- a/target/linux/ath79/base-files/etc/uci-defaults/04_led_migration +++ b/target/linux/ath79/base-files/etc/uci-defaults/04_led_migration @@ -10,6 +10,9 @@ case "$board" in engenius,epg5000) migrate_leds ":wlan-2g=:wlan2g" ":wlan-5g=:wlan5g" ;; +pcs,cap324) + migrate_leds "lan:amber=amber:lan" "lan:green=green:lan" + ;; tplink,archer-c25-v1|\ tplink,archer-c58-v1|\ tplink,archer-c59-v1|\ diff --git a/target/linux/ath79/dts/ar9344_pcs_cap324.dts b/target/linux/ath79/dts/ar9344_pcs_cap324.dts index 7a211e9088..456bd85cd9 100644 --- a/target/linux/ath79/dts/ar9344_pcs_cap324.dts +++ b/target/linux/ath79/dts/ar9344_pcs_cap324.dts @@ -60,12 +60,12 @@ }; lan_amber { - label = "pcs:lan:amber"; + label = "pcs:amber:lan"; gpios = <&gpio 15 GPIO_ACTIVE_LOW>; }; lan_green { - label = "pcs:lan:green"; + label = "pcs:green:lan"; gpios = <&gpio 14 GPIO_ACTIVE_LOW>; }; }; -- 2.30.2