From c3319322b2eec0769a380a14094c3c7482387a03 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 30 Sep 2020 20:49:57 +0200 Subject: lantiq: remove model name from LED labels Like in the previous patches for other targets, this will remove the "devicename" from LED labels in lantiq. The devicename is removed in DTS files and 01_leds, consolidation of definitions into DTSI files is done where (easily) possible, and migration scripts are updated. The DTS/DTSI consolidation is only performed for files-5.4. For lantiq,easy98020 some LED definitions have the form "devicename:function" without the color, so we need to implement explicit migration for that one. Signed-off-by: Adrian Schmutzler --- .../lantiq/xrx200/base-files/etc/board.d/01_leds | 28 ++++++++++------------ .../base-files/etc/uci-defaults/01_led_migration | 2 ++ 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'target/linux/lantiq/xrx200') diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds b/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds index b4d26d37ff..6a19f52a1e 100755 --- a/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds +++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds @@ -32,36 +32,34 @@ board=$(board_name) case "$board" in arcadyan,arv7519rw22) - ucidef_set_led_netdev "lan" "lan" "arv7519rw22:green:lan" "eth0.1" + ucidef_set_led_netdev "lan" "lan" "green:lan" "eth0.1" ;; arcadyan,vgv7510kw22-nor|\ -arcadyan,vgv7510kw22-brn) - ucidef_set_led_wlan "wifi" "wifi" "vgv7510kw22:green:wlan" "phy0radio" +arcadyan,vgv7510kw22-brn|\ +zyxel,p-2812hnu-f1|\ +zyxel,p-2812hnu-f3) + ucidef_set_led_wlan "wifi" "wifi" "green:wlan" "phy0radio" ;; arcadyan,vgv7519-nor|\ arcadyan,vgv7519-brn) - ucidef_set_led_wlan "wifi" "wifi" "vgv7519:green:wireless" "phy0radio" + ucidef_set_led_wlan "wifi" "wifi" "green:wireless" "phy0radio" ;; avm,fritz3370-rev2-hynix|\ avm,fritz3370-rev2-micron) - ucidef_set_led_switch "lan" "LAN" "fritz3370:green:lan" "switch0" "0x17" + ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x17" ;; bt,homehub-v5a) ucidef_set_led_default "dimmed" "dimmed" "dimmed" "0" ;; buffalo,wbmr-300hpd) - ucidef_set_led_switch "lan1" "LAN1" "wbmr300:green:lan1" "switch0" "0x08" - ucidef_set_led_switch "lan2" "LAN2" "wbmr300:green:lan2" "switch0" "0x04" - ucidef_set_led_switch "wan" "WAN" "wbmr300:green:wan" "switch0" "0x10" - ucidef_set_led_switch "lan3" "LAN3" "wbmr300:green:lan3" "switch0" "0x20" - ucidef_set_led_default "router" "router" "wbmr300:green:router" "1" + ucidef_set_led_switch "lan1" "LAN1" "green:lan1" "switch0" "0x08" + ucidef_set_led_switch "lan2" "LAN2" "green:lan2" "switch0" "0x04" + ucidef_set_led_switch "wan" "WAN" "green:wan" "switch0" "0x10" + ucidef_set_led_switch "lan3" "LAN3" "green:lan3" "switch0" "0x20" + ucidef_set_led_default "router" "router" "green:router" "1" ;; netgear,dm200) - ucidef_set_led_netdev "lan" "lan" "dm200:green:lan" "eth0" - ;; -zyxel,p-2812hnu-f1|\ -zyxel,p-2812hnu-f3) - ucidef_set_led_wlan "wifi" "wifi" "p2812hnufx:green:wlan" "phy0radio" + ucidef_set_led_netdev "lan" "lan" "green:lan" "eth0" ;; esac diff --git a/target/linux/lantiq/xrx200/base-files/etc/uci-defaults/01_led_migration b/target/linux/lantiq/xrx200/base-files/etc/uci-defaults/01_led_migration index 35903d212c..94f9df78bd 100644 --- a/target/linux/lantiq/xrx200/base-files/etc/uci-defaults/01_led_migration +++ b/target/linux/lantiq/xrx200/base-files/etc/uci-defaults/01_led_migration @@ -27,6 +27,8 @@ bt,homehub-v5a) ;; esac +remove_devicename_leds + migrations_apply system exit 0 -- cgit v1.2.3