[openwrt/openwrt] lantiq: remove model name from LED labels

LEDE Commits lede-commits at lists.infradead.org
Thu Oct 8 14:21:56 EDT 2020


adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/c3319322b2eec0769a380a14094c3c7482387a03

commit c3319322b2eec0769a380a14094c3c7482387a03
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Wed Sep 30 20:49:57 2020 +0200

    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 <freifunk at adrianschmutzler.de>
---
 .../lantiq/ase/base-files/etc/board.d/01_leds      |  2 +-
 .../base-files/etc/uci-defaults/01_led_migration   | 11 +++
 .../base-files/etc/uci-defaults/01_led_migration   | 19 +++++
 .../boot/dts/lantiq/amazonse_allnet_all0333cj.dts  | 10 +--
 .../boot/dts/lantiq/amazonse_netgear_dgn1000b.dts  | 10 +--
 .../mips/boot/dts/lantiq/ar9_avm_fritz7312.dts     | 10 +--
 .../mips/boot/dts/lantiq/ar9_avm_fritz7320.dts     | 12 +--
 .../mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts    | 18 ++---
 .../boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts  | 18 ++---
 .../mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi  | 18 ++---
 .../arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts    | 14 ++--
 .../mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts    | 18 ++---
 .../boot/dts/lantiq/danube_arcadyan_arv4519pw.dts  | 28 +++----
 .../boot/dts/lantiq/danube_arcadyan_arv4520pw.dts  | 28 +++----
 .../boot/dts/lantiq/danube_arcadyan_arv4525pw.dts  | 10 +--
 .../boot/dts/lantiq/danube_arcadyan_arv452cqw.dts  | 30 ++++----
 .../dts/lantiq/danube_arcadyan_arv7506pw11.dts     | 18 ++---
 .../boot/dts/lantiq/danube_arcadyan_arv7518pw.dts  | 28 +++----
 .../boot/dts/lantiq/danube_arcadyan_arv7525pw.dts  | 12 +--
 .../boot/dts/lantiq/danube_arcadyan_arv752dpw.dts  | 24 +++---
 .../dts/lantiq/danube_arcadyan_arv752dpw22.dts     | 32 ++++----
 .../dts/lantiq/danube_arcadyan_arv8539pw22.dts     | 10 +--
 .../mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts | 22 +++---
 .../boot/dts/lantiq/falcon_lantiq_easy88388.dts    | 24 +++---
 .../boot/dts/lantiq/falcon_lantiq_easy88444.dts    | 14 ++--
 .../boot/dts/lantiq/falcon_lantiq_easy98000.dtsi   | 12 +--
 .../dts/lantiq/falcon_lantiq_easy98020-v18.dts     | 10 +--
 .../boot/dts/lantiq/falcon_lantiq_easy98020.dts    | 18 ++---
 .../boot/dts/lantiq/falcon_lantiq_easy98021.dts    | 10 +--
 .../boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts   | 10 +--
 .../boot/dts/lantiq/vr9_alphanetworks_asl56026.dts |  6 +-
 .../boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts   | 14 ++--
 .../mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts  |  6 +-
 .../boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi  | 18 ++---
 .../mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi | 28 +++----
 .../boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi    | 14 ++--
 .../mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts  | 12 +--
 .../mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts   | 12 +--
 .../mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts   | 12 +--
 .../mips/boot/dts/lantiq/vr9_avm_fritz7412.dts     | 12 +--
 .../mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts    | 18 ++---
 .../boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts    | 24 +++---
 .../mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi | 18 ++---
 .../mips/boot/dts/lantiq/vr9_netgear_dm200.dts     | 12 +--
 .../mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts    |  2 +-
 .../mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi   | 12 +--
 .../arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts | 16 ++--
 .../mips/boot/dts/lantiq/vr9_tplink_vr200v.dts     | 16 ++--
 .../boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts     |  4 +-
 .../boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi    | 24 +++---
 .../boot/dts/lantiq/amazonse_allnet_all0333cj.dts  | 10 +--
 .../boot/dts/lantiq/amazonse_netgear_dgn1000b.dts  | 10 +--
 .../mips/boot/dts/lantiq/ar9_avm_fritz7312.dts     | 10 +--
 .../mips/boot/dts/lantiq/ar9_avm_fritz7320.dts     | 12 +--
 .../mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts    | 18 ++---
 .../boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts  | 18 ++---
 .../mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi  | 18 ++---
 .../arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts    | 14 ++--
 .../mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts    | 18 ++---
 .../boot/dts/lantiq/danube_arcadyan_arv4519pw.dts  | 28 +++----
 .../boot/dts/lantiq/danube_arcadyan_arv4520pw.dts  | 28 +++----
 .../boot/dts/lantiq/danube_arcadyan_arv4525pw.dts  | 10 +--
 .../boot/dts/lantiq/danube_arcadyan_arv452cqw.dts  | 30 ++++----
 .../dts/lantiq/danube_arcadyan_arv7506pw11.dts     | 18 ++---
 .../boot/dts/lantiq/danube_arcadyan_arv7518pw.dts  | 28 +++----
 .../boot/dts/lantiq/danube_arcadyan_arv7525pw.dts  | 12 +--
 .../boot/dts/lantiq/danube_arcadyan_arv752dpw.dts  | 24 +++---
 .../dts/lantiq/danube_arcadyan_arv752dpw22.dts     | 32 ++++----
 .../dts/lantiq/danube_arcadyan_arv8539pw22.dts     | 10 +--
 .../mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts | 22 +++---
 .../boot/dts/lantiq/falcon_lantiq_easy88388.dts    | 24 +++---
 .../boot/dts/lantiq/falcon_lantiq_easy88444.dts    | 14 ++--
 .../boot/dts/lantiq/falcon_lantiq_easy98000.dtsi   | 12 +--
 .../dts/lantiq/falcon_lantiq_easy98020-v18.dts     | 10 +--
 .../boot/dts/lantiq/falcon_lantiq_easy98020.dts    | 18 ++---
 .../boot/dts/lantiq/falcon_lantiq_easy98021.dts    | 10 +--
 .../boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts   | 10 +--
 .../boot/dts/lantiq/vr9_alphanetworks_asl56026.dts |  6 +-
 .../boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts   | 14 ++--
 .../mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts  |  6 +-
 .../boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi  | 18 ++---
 .../mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi | 28 +++----
 .../boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi    | 14 ++--
 .../mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts  | 24 ------
 .../mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts   | 24 ------
 .../mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts   | 24 ------
 .../mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi    | 30 +++++---
 .../mips/boot/dts/lantiq/vr9_avm_fritz7412.dts     | 12 +--
 .../mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts    | 18 ++---
 .../boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts    | 24 +++---
 .../mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi | 18 ++---
 .../mips/boot/dts/lantiq/vr9_netgear_dm200.dts     | 12 +--
 .../mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts    | 10 +--
 .../mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi   | 39 +++++-----
 .../arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts | 87 +++-------------------
 .../mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi     | 78 +++++++++++++++++++
 .../mips/boot/dts/lantiq/vr9_tplink_vr200v.dts     | 87 +++-------------------
 .../boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts     |  4 +-
 .../boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi    | 24 +++---
 .../lantiq/xrx200/base-files/etc/board.d/01_leds   | 28 ++++---
 .../base-files/etc/uci-defaults/01_led_migration   |  2 +
 .../lantiq/xway/base-files/etc/board.d/01_leds     |  4 +-
 .../base-files/etc/uci-defaults/01_led_migration   |  4 +-
 .../xway_legacy/base-files/etc/board.d/01_leds     |  2 +-
 .../base-files/etc/uci-defaults/01_led_migration   |  2 +
 105 files changed, 906 insertions(+), 985 deletions(-)

diff --git a/target/linux/lantiq/ase/base-files/etc/board.d/01_leds b/target/linux/lantiq/ase/base-files/etc/board.d/01_leds
index 6a8de7d7a5..3e58463c91 100755
--- a/target/linux/lantiq/ase/base-files/etc/board.d/01_leds
+++ b/target/linux/lantiq/ase/base-files/etc/board.d/01_leds
@@ -23,7 +23,7 @@ board=$(board_name)
 
 case "$board" in
 allnet,all0333cj)
-	ucidef_set_led_netdev "lan" "lan" "all0333cj:green:lan" "eth0.1"
+	ucidef_set_led_netdev "lan" "lan" "green:lan" "eth0.1"
 	;;
 esac
 
diff --git a/target/linux/lantiq/ase/base-files/etc/uci-defaults/01_led_migration b/target/linux/lantiq/ase/base-files/etc/uci-defaults/01_led_migration
new file mode 100644
index 0000000000..46b8a47e8a
--- /dev/null
+++ b/target/linux/lantiq/ase/base-files/etc/uci-defaults/01_led_migration
@@ -0,0 +1,11 @@
+#
+# Copyright (C) 2020 OpenWrt.org
+#
+
+. /lib/functions/migrations.sh
+
+remove_devicename_leds
+
+migrations_apply system
+
+exit 0
diff --git a/target/linux/lantiq/falcon/base-files/etc/uci-defaults/01_led_migration b/target/linux/lantiq/falcon/base-files/etc/uci-defaults/01_led_migration
new file mode 100644
index 0000000000..adc2e336f6
--- /dev/null
+++ b/target/linux/lantiq/falcon/base-files/etc/uci-defaults/01_led_migration
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 2020 OpenWrt.org
+#
+
+. /lib/functions/migrations.sh
+
+board=$(board_name)
+
+case "$board" in
+lantiq,easy98020)
+	migrate_leds "easy98020:="
+	;;
+esac
+
+remove_devicename_leds
+
+migrations_apply system
+
+exit 0
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
index 8bb3e3cbd8..bbb33cdca3 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
@@ -30,27 +30,27 @@
 
 		/* power led: red=off, green=on */
 		power: power {
-			label = "all0333cj:green:power";
+			label = "green:power";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		lan: lan {
-			label = "all0333cj:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		dsl: dsl {
-			label = "all0333cj:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		online_green: online {
-			label = "all0333cj:green:online";
+			label = "green:online";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 		online_red {
-			label = "all0333cj:red:online";
+			label = "red:online";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts
index 943b00f898..33658ca512 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts
@@ -51,27 +51,27 @@
 	leds {
 		compatible = "gpio-leds";
 		dsl: dsl {
-			label = "dgn1000b:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		online_green: online {
-			label = "dgn1000b:green:online";
+			label = "green:online";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		online2 {
-			label = "dgn1000b:red:online";
+			label = "red:online";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		wps {
-			label = "dgn1000b:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		power: power {
-			label = "dgn1000b:green:power";
+			label = "green:power";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
index 0f635127f8..6c5ed277ca 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
@@ -47,24 +47,24 @@
 		compatible = "gpio-leds";
 
 		power: power {
-			label = "fritz7312:green:power";
+			label = "green:power";
 			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		voice {
-			label = "fritz7312:green:fon";
+			label = "green:fon";
 			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 		dect {
-			label = "fritz7312:green:dect";
+			label = "green:dect";
 			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 		wlan: wlan {
-			label = "fritz7312:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
 		};
 		info_green: info_green {
-			label = "fritz7312:green:info";
+			label = "green:info";
 			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
index 424b778bb4..e215baf6f1 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
@@ -46,28 +46,28 @@
 	leds {
 		compatible = "gpio-leds";
 		power: power {
-			label = "fritz7320:green:power";
+			label = "green:power";
 			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		voice {
-			label = "fritz7320:green:fon";
+			label = "green:fon";
 			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 		dect {
-			label = "fritz7320:green:dect";
+			label = "green:dect";
 			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 		wlan: wlan {
-			label = "fritz7320:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
 		};
 		info_green: info_green {
-			label = "fritz7320:green:info";
+			label = "green:info";
 			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 		info_red {
-			label = "fritz7320:red:info";
+			label = "red:info";
 			gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
index 9c1ebf42f0..acfa023154 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
@@ -51,42 +51,42 @@
 		compatible = "gpio-leds";
 
 		wireless-red {
-			label = "bthomehubv3a:red:wireless";
+			label = "red:wireless";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		wireless-orange {
-			label = "bthomehubv3a:orange:wireless";
+			label = "orange:wireless";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wireless_blue: wireless-blue {
-			label = "bthomehubv3a:blue:wireless";
+			label = "blue:wireless";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 
 		broadband-red {
-			label = "bthomehubv3a:red:broadband";
+			label = "red:broadband";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 		broadband-orange {
-			label = "bthomehubv3a:orange:broadband";
+			label = "orange:broadband";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 		broadband_blue: broadband-blue {
-			label = "bthomehubv3a:blue:broadband";
+			label = "blue:broadband";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		power_red: power-red {
-			label = "bthomehubv3a:red:power";
+			label = "red:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		power_orange: power-orange {
-			label = "bthomehubv3a:orange:power";
+			label = "orange:power";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_blue: power-blue {
-			label = "bthomehubv3a:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
index 98ce11c250..d44ebf43ed 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
@@ -59,40 +59,40 @@
 		compatible = "gpio-leds";
 
 		power_green: power {
-			label = "wbmr:green:power";
+			label = "green:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
-			label = "wbmr:red:power";
+			label = "red:power";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		security {
-			label = "wbmr:yellow:security";
+			label = "yellow:security";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "wbmr:green:wireless";
+			label = "green:wireless";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "wbmr:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 		online_green: online {
-			label = "wbmr:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
-			label = "wbmr:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 		movie {
-			label = "wbmr:blue:movie";
+			label = "blue:movie";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "wbmr:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
index 64fae44e7f..18168230b6 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
@@ -67,40 +67,40 @@
 	leds {
 		compatible = "gpio-leds";
 		internet: internet {
-			label = "dgn3500:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		internet2 {
-			label = "dgn3500:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "dgn3500:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "dgn3500:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power {
-			label = "dgn3500:green:power";
+			label = "green:power";
 			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
-			label = "dgn3500:red:power";
+			label = "red:power";
 			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
 		};
 		wifi_green: wifi {
-			label = "dgn3500:green:wireless";
+			label = "green:wireless";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		wifi2 {
-			label = "dgn3500:amber:wireless";
+			label = "amber:wireless";
 			gpios = <&gpio 51 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "dgn3500:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 52 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
index 95df8ed048..3c80edea24 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
@@ -54,32 +54,32 @@
 		compatible = "gpio-leds";
 
 		power_green: power {
-			label = "h201l:green:power";
+			label = "green:power";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		online: online {
-			label = "h201l:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "h201l:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		phone {
-			label = "h201l:green:phone";
+			label = "green:phone";
 			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "h201l:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "h201l:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "h201l:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
index 81ce539930..06bcf94a14 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
@@ -48,40 +48,40 @@
 		compatible = "gpio-leds";
 
 		power_green: power {
-			label = "p2601hnfx:green:power";
+			label = "green:power";
 			gpios = <&stp 11 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
-			label = "p2601hnfx:red:power";
+			label = "red:power";
 			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 		};
 		online: online {
-			label = "p2601hnfx:green:internet";
+			label = "green:internet";
 			gpios = <&stp 13 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
-			label = "p2601hnfx:red:internet";
+			label = "red:internet";
 			gpios = <&stp 12 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "p2601hnfx:green:dsl";
+			label = "green:dsl";
 			gpios = <&stp 14 GPIO_ACTIVE_LOW>;
 		};
 		phone {
-			label = "p2601hnfx:green:phone";
+			label = "green:phone";
 			gpios = <&stp 9 GPIO_ACTIVE_LOW>;
 		};
 		phone2 {
-			label = "p2601hnfx:orange:phone";
+			label = "orange:phone";
 			gpios = <&stp 8 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "p2601hnfx:green:wireless";
+			label = "green:wireless";
 			gpios = <&stp 15 GPIO_ACTIVE_LOW>;
 		};
 		wifi2 {
-			label = "p2601hnfx:orange:wireless";
+			label = "orange:wireless";
 			gpios = <&stp 10 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
index 42eb12c80b..5c27690691 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
@@ -49,60 +49,60 @@
 		compatible = "gpio-leds";
 
 		power_green: power {
-			label = "arv4519pw:green:power";
+			label = "green:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
-			label = "arv4519pw:red:power";
+			label = "red:power";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv4519pw:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "arv4519pw:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: online {
-			label = "arv4519pw:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
-			label = "arv4519pw:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "arv4519pw:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		voip {
-			label = "arv4519pw:green:voip";
+			label = "green:voip";
 			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
-			label = "arv4519pw:green:phone1";
+			label = "green:phone1";
 			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv4519pw:green:phone2";
+			label = "green:phone2";
 			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
-			label = "arv4519pw:green:line";
+			label = "green:line";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
-			label = "arv4519pw:green:wps";
+			label = "green:wps";
 			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "arv4519pw:orange:wps";
+			label = "orange:wps";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wps3 {
-			label = "arv4519pw:red:wps";
+			label = "red:wps";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
index 02ec8705af..1686695a3a 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
@@ -49,63 +49,63 @@
 		compatible = "gpio-leds";
 
 		power_blue: power {
-			label = "arv4520pw:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl: dsl {
-			label = "arv4520pw:blue:dsl";
+			label = "blue:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet_blue: internet {
-			label = "arv4520pw:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power2 {
-			label = "arv4520pw:red:power";
+			label = "red:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "arv4520pw:yellow:wps";
+			label = "yellow:wps";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
-			label = "arv4520pw:red:wps";
+			label = "red:wps";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		/*
 			wps green is missing
 		*/
 		fxs1 {
-			label = "arv4520pw:blue:telefon1";
+			label = "blue:telefon1";
 			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv4520pw:blue:telefon2";
+			label = "blue:telefon2";
 			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		isdn {
-			label = "arv4520pw:blue:isdn";
+			label = "blue:isdn";
 			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
-			label = "arv4520pw:blue:line";
+			label = "blue:line";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		voice {
-			label = "arv4520pw:blue:sprache";
+			label = "blue:sprache";
 			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "arv4520pw:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv4520pw:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		internet2 {
-			label = "arv4520pw:red:internet";
+			label = "red:internet";
 			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 		/*
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
index b1c1b8be8e..b0de893f3b 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
@@ -53,23 +53,23 @@
 	leds {
 		compatible = "gpio-leds";
 		fxo {
-			label = "arv4525pw:green:festnetz";
+			label = "green:festnetz";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		fxs {
-			label = "arv4525pw:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "arv4525pw:green:t-dsl";
+			label = "green:t-dsl";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv4525pw:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		online: online {
-			label = "arv4525pw:green:online";
+			label = "green:online";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
index 096180ac9d..23f7033a4e 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
@@ -59,56 +59,56 @@
 	leds {
 		compatible = "gpio-leds";
 		power_blue: power0 {
-			label = "arv452cqw:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl_blue: dsl {
-			label = "arv452cqw:blue:dsl";
+			label = "blue:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		isdn {
-			label = "arv452cqw:blue:isdn";
+			label = "blue:isdn";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power1 {
-			label = "arv452cqw:red:power";
+			label = "red:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "arv452cqw:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		wps1 {
-			label = "arv452cqw:yellow:wps";
+			label = "yellow:wps";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
-			label = "arv452cqw:blue:telefon1";
+			label = "blue:telefon1";
 			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv452cqw:blue:telefon2";
+			label = "blue:telefon2";
 			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
-			label = "arv452cqw:red:wps";
+			label = "red:wps";
 			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
-			label = "arv452cqw:blue:line";
+			label = "blue:line";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		voice {
-			label = "arv452cqw:blue:sprache";
+			label = "blue:sprache";
 			gpios = <&gpiomm 4 1>;
 		};
 		led_usb: usb {
-			label = "arv452cqw:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv452cqw:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		/*
@@ -116,11 +116,11 @@
 			dsl2 and dsl3 are not referenced in manual
 		*/
 		dsl2 {
-			label = "arv452cqw:yellow:dsl";
+			label = "yellow:dsl";
 			gpios = <&gpiomm 8 GPIO_ACTIVE_LOW>;
 		};
 		dsl3 {
-			label = "arv452cqw:red:dsl";
+			label = "red:dsl";
 			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
index 854648ddc3..3af34d6d4e 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
@@ -47,40 +47,40 @@
 	leds {
 		compatible = "gpio-leds";
 		wlan: wlan {
-			label = "arv7506pw11:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		power: power {
-			label = "arv7506pw11:green:power";
+			label = "green:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl: dsl {
-			label = "arv7506pw11:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet: internet {
-			label = "arv7506pw11:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power_red {
-			label = "arv7506pw11:red:power";
+			label = "red:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		internet_red {
-			label = "arv7506pw11:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		info {
-			label = "arv7506pw11:green:info";
+			label = "green:info";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		telefon {
-			label = "arv7506pw11:green:telefon";
+			label = "green:telefon";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		info_red {
-			label = "arv7506pw11:red:info";
+			label = "red:info";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
index 3f4112318d..3e2a789192 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
@@ -48,60 +48,60 @@
 	leds {
 		compatible = "gpio-leds";
 		power_green: power {
-			label = "arv7518pw:green:power";
+			label = "green:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl: dsl {
-			label = "arv7518pw:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		online_green: online {
-			label = "arv7518pw:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv7518pw:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power2 {
-			label = "arv7518pw:red:power";
+			label = "red:power";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
-			label = "arv7518pw:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "arv7518pw:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		voice {
-			label = "arv7518pw:green:voip";
+			label = "green:voip";
 			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
-			label = "arv7518pw:green:phone1";
+			label = "green:phone1";
 			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv7518pw:green:phone2";
+			label = "green:phone2";
 			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		unlabeled {
-			label = "arv7518pw:amber:unlabeled";
+			label = "amber:unlabeled";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "arv7518pw:amber:wps";
+			label = "amber:wps";
 			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
-			label = "arv7518pw:green:wps";
+			label = "green:wps";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wps3 {
-			label = "arv7518pw:red:wps";
+			label = "red:wps";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
index c074976155..a4a78f491b 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
@@ -47,28 +47,28 @@
 	leds {
 		compatible = "gpio-leds";
 		power_green: power {
-			label = "arv7525pw:green:power";
+			label = "green:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power1 {
-			label = "arv7525pw:red:power";
+			label = "red:power";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		online: online {
-			label = "arv7525pw:green:online";
+			label = "green:online";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		voice {
-			label = "arv7525pw:green:telefonie";
+			label = "green:telefonie";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		voice2 {
-			label = "arv7525pw:red:telefonie";
+			label = "red:telefonie";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv7525pw:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index a3cb132019..e39cd4ea46 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
@@ -59,52 +59,52 @@
 	leds {
 		compatible = "gpio-leds";
 		power_blue: power1 {
-			label = "arv752dpw:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 		internet_red: internet {
-			label = "arv752dpw:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		message {
-			label = "arv752dpw:red:message";
+			label = "red:message";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power {
-			label = "arv752dpw:red:power";
+			label = "red:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		voice1 {
-			label = "arv752dpw:red:voice";
+			label = "red:voice";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		umts: umts {
-			label = "arv752dpw:red:umts";
+			label = "red:umts";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv752dpw:red:wifi";
+			label = "red:wifi";
 			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
-			label = "arv752dpw:green:tae-n";
+			label = "green:tae-n";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv752dpw:green:tae-u";
+			label = "green:tae-u";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
-			label = "arv752dpw:green:isdn";
+			label = "green:isdn";
 			gpios = <&gpiomm 7 GPIO_ACTIVE_LOW>;
 		};
 		internet2 {
-			label = "arv752dpw:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpiomm 8 GPIO_ACTIVE_LOW>;
 		};
 		voice2 {
-			label = "arv752dpw:blue:voice";
+			label = "blue:voice";
 			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
index 60fd8bb918..8ac7eea618 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
@@ -57,68 +57,68 @@
 	leds {
 		compatible = "gpio-leds";
 		power_blue: power1 {
-			label = "arv752dpw22:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 		internet_red: internet {
-			label = "arv752dpw22:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		message {
-			label = "arv752dpw22:red:message";
+			label = "red:message";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power {
-			label = "arv752dpw22:red:power";
+			label = "red:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		voice1 {
-			label = "arv752dpw22:red:voice";
+			label = "red:voice";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		umts: umts {
-			label = "arv752dpw22:red:umts";
+			label = "red:umts";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv752dpw22:red:wifi";
+			label = "red:wifi";
 			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
-			label = "arv752dpw22:green:tae-n";
+			label = "green:tae-n";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv752dpw22:green:tae-u";
+			label = "green:tae-u";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
-			label = "arv752dpw22:green:isdn";
+			label = "green:isdn";
 			gpios = <&gpiomm 7 GPIO_ACTIVE_LOW>;
 		};
 		internet2 {
-			label = "arv752dpw22:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpiomm 8 GPIO_ACTIVE_LOW>;
 		};
 		voice2 {
-			label = "arv752dpw22:blue:voice";
+			label = "blue:voice";
 			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 		eth1 {
-			 label = "arv752dpw22:green:lan1";
+			 label = "green:lan1";
 			 gpios = <&gpiomm 11 GPIO_ACTIVE_LOW>;
 		};
 		eth2 {
-			label = "arv752dpw22:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpiomm 12 GPIO_ACTIVE_LOW>;
 		};
 		eth3 {
-			label = "arv752dpw22:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpiomm 13 GPIO_ACTIVE_LOW>;
 		};
 		eth4 {
-			label = "arv752dpw22:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpiomm 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
index 4bf44a10e1..4c9d71fae2 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
@@ -49,27 +49,27 @@
 		compatible = "gpio-leds";
 
 		power_green: power-green {
-			label = "arv8539pw22:green:power";
+			label = "green:power";
 			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power-red {
-			label = "arv8539pw22:red:power";
+			label = "red:power";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		dsl_green: dsl-green {
-			label = "arv8539pw22:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		online_green: online-green {
-			label = "arv8539pw22:green:online";
+			label = "green:online";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		wireless_green: wireless-green {
-			label = "arv8539pw22:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		/*
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
index 9f2d8ec336..66ff6f33d5 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
@@ -52,52 +52,52 @@
 		compatible = "gpio-leds";
 
 		upgrading-orange {
-			label = "bthomehubv2b:orange:upgrading";
+			label = "orange:upgrading";
 			gpios = <&gpios 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		phone-orange {
-			label = "bthomehubv2b:orange:phone";
+			label = "orange:phone";
 			gpios = <&gpios 6 GPIO_ACTIVE_HIGH>;
 		};
 		phone-blue {
-			label = "bthomehubv2b:blue:phone";
+			label = "blue:phone";
 			gpios = <&gpios 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		wireless-orange {
-			label = "bthomehubv2b:orange:wireless";
+			label = "orange:wireless";
 			gpios = <&gpios 8 GPIO_ACTIVE_HIGH>;
 		};
 		wireless_blue: wireless-blue {
-			label = "bthomehubv2b:blue:wireless";
+			label = "blue:wireless";
 			gpios = <&gpios 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		broadband-red {
-			label = "bthomehubv2b:red:broadband";
+			label = "red:broadband";
 			gpios = <&gpios 10 GPIO_ACTIVE_HIGH>;
 		};
 		broadband-orange {
-			label = "bthomehubv2b:orange:broadband";
+			label = "orange:broadband";
 			gpios = <&gpios 11 GPIO_ACTIVE_HIGH>;
 		};
 		broadband_blue: broadband-blue {
-			label = "bthomehubv2b:blue:broadband";
+			label = "blue:broadband";
 			gpios = <&gpios 12 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_red: power-red {
-			label = "bthomehubv2b:red:power";
+			label = "red:power";
 			gpios = <&gpios 13 GPIO_ACTIVE_HIGH>;
 		};
 		power_orange: power-orange {
-			label = "bthomehubv2b:orange:power";
+			label = "orange:power";
 			gpios = <&gpios 14 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		power_blue: power-blue {
-			label = "bthomehubv2b:blue:power";
+			label = "blue:power";
 			gpios = <&gpios 15 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
index 22ce8caced..1661480af4 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
@@ -40,52 +40,52 @@
 		pinctrl-0 = <&led_pins &bootled_pins>;
 
 		GPON {
-			label = "easy88388:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 		};
 		TEST {
-			label = "easy88388:green:test";
+			label = "green:test";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 		};
 		STATUS {
-			label = "easy88388:green:status";
+			label = "green:status";
 			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
 		};
 		ERROR {
-			label = "easy88388:red:error";
+			label = "red:error";
 			gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
 		};
 
 		DSL1 {
-			label = "easy88388:dsl:1";
+			label = "dsl:1";
 			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 		};
 		DSL2 {
-			label = "easy88388:dsl:2";
+			label = "dsl:2";
 			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 		};
 		DSL3 {
-			label = "easy88388:dsl:3";
+			label = "dsl:3";
 			gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
 		};
 		DSL4 {
-			label = "easy88388:dsl:4";
+			label = "dsl:4";
 			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
 		};
 		DSL5 {
-			label = "easy88388:dsl:5";
+			label = "dsl:5";
 			gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
 		};
 		DSL6 {
-			label = "easy88388:dsl:6";
+			label = "dsl:6";
 			gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
 		};
 		DSL7 {
-			label = "easy88388:dsl:7";
+			label = "dsl:7";
 			gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
 		};
 		DSL8 {
-			label = "easy88388:dsl:8";
+			label = "dsl:8";
 			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
index fa331450bf..234c7f005e 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
@@ -39,32 +39,32 @@
 		pinctrl-0 = <&led_pins &bootled_pins>;
 
 		GPON {
-			label = "easy88444:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 		};
 		TEST {
-			label = "easy88444:green:test";
+			label = "green:test";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 		};
 		STATUS {
-			label = "easy88444:green:status";
+			label = "green:status";
 			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		GFAST1 {
-			label = "easy88444:gfast:1";
+			label = "gfast:1";
 			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 		};
 		GFAST2 {
-			label = "easy88444:gfast:2";
+			label = "gfast:2";
 			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 		};
 		GFAST3 {
-			label = "easy88444:gfast:3";
+			label = "gfast:3";
 			gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
 		};
 		GFAST4 {
-			label = "easy88444:gfast:4";
+			label = "gfast:4";
 			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi
index 5821c51def..6d5d3cb8d1 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi
@@ -17,32 +17,32 @@
 		pinctrl-0 = <&bootled_pins>;
 
 		LED_0 {
-			label = "easy98000:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_1 {
-			label = "easy98000:red:gpon";
+			label = "red:gpon";
 			gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_2 {
-			label = "easy98000:green:gpon_tx";
+			label = "green:gpon_tx";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_3 {
-			label = "easy98000:green:gpon_rx";
+			label = "green:gpon_rx";
 			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_4 {
-			label = "easy98000:green:voice";
+			label = "green:voice";
 			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_5 {
-			label = "easy98000:green:status";
+			label = "green:status";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
index 773a490019..eb16cd0b88 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
@@ -40,27 +40,27 @@
 		pinctrl-0 = <&led_pins &bootled_pins>;
 
 		GPON {
-			label = "easy98020:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		TEST {
-			label = "easy98020:green:test";
+			label = "green:test";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		ETH {
-			label = "easy98020:green:status";
+			label = "green:status";
 			gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		VOICE {
-			label = "easy98020:green:voice";
+			label = "green:voice";
 			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		VIDEO {
-			label = "easy98020:green:video";
+			label = "green:video";
 			gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
index 397764aac4..abbb871642 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
@@ -40,45 +40,45 @@
 		pinctrl-0 = <&bootled_pins>, <&led_pins>;
 
 		GPON {
-			label = "easy98020:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		TEST {
-			label = "easy98020:green:test";
+			label = "green:test";
 			gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		ETH {
-			label = "easy98020:green:status";
+			label = "green:status";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		VOICE {
-			label = "easy98020:green:voice";
+			label = "green:voice";
 			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		VIDEO {
-			label = "easy98020:green:video";
+			label = "green:video";
 			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		GE0_ACT {
-			label = "easy98020:ge0_act";
+			label = "ge0_act";
 			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 		};
 		GE0_LINK {
-			label = "easy98020:ge0_link";
+			label = "ge0_link";
 			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
 		};
 		GE1_ACT {
-			label = "easy98020:ge1_act";
+			label = "ge1_act";
 			gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
 		};
 		GE1_LINK {
-			label = "easy98020:ge1_link";
+			label = "ge1_link";
 			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
index aa63268149..3f3cb1e2fe 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
@@ -52,27 +52,27 @@
 		pinctrl-0 = <&led_pins &bootled_pins>;
 
 		GPON {
-			label = "easy98021:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		TEST {
-			label = "easy98021:red:test";
+			label = "red:test";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		ETH {
-			label = "easy98021:green:status";
+			label = "green:status";
 			gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		VOICE {
-			label = "easy98021:green:voice";
+			label = "green:voice";
 			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		SIMCARD {
-			label = "easy98021:green:simcard";
+			label = "green:simcard";
 			gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
index 130d49ebd7..12c178ebd9 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
@@ -24,27 +24,27 @@
 		pinctrl-0 = <&bootled_pins>;
 
 		LED_0 {
-			label = "mdu:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_1 {
-			label = "mdu:green:status";
+			label = "green:status";
 			gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_2 {
-			label = "mdu:green:2";
+			label = "green:2";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_3 {
-			label = "mdu:green:3";
+			label = "green:3";
 			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_4 {
-			label = "mdu:green:4";
+			label = "green:4";
 			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
index b9be5d55d2..5418ac675d 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
@@ -42,19 +42,19 @@
 		compatible = "gpio-leds";
 
 		dsl: dsl {
-			label = "asl56026:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		/* power-* is a bicolour led */
 		power_green: power_green {
-			label = "asl56026:green:power";
+			label = "green:power";
 			gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		power_red: power_red {
-			label = "asl56026:red:power";
+			label = "red:power";
 			gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
index 8a4a694c40..2b3d38fd8b 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
@@ -52,32 +52,32 @@
 		compatible = "gpio-leds";
 
 		lan_green {
-			label = "arv7519rw22:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		internet_red {
-			label = "arv7519rw22:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power_green {
-			label = "arv7519rw22:green:power";
+			label = "green:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		alarm_blue {
-			label = "arv7519rw22:blue:alarm";
+			label = "blue:alarm";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 		internet_orange {
-			label = "arv7519rw22:orange:internet";
+			label = "orange:internet";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: internet_green {
-			label = "arv7519rw22:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 		voice_green {
-			label = "arv7519rw22:green:voice";
+			label = "green:voice";
 			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
index ba1a01e36f..a579d98bf2 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
@@ -41,15 +41,15 @@
 		compatible = "gpio-leds";
 
 		power_red: power2 {
-			label = "vg3503j:red:power";
+			label = "red:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "vg3503j:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power {
-			label = "vg3503j:green:power";
+			label = "green:power";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
index 017e473a04..a6206f4a87 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
@@ -47,48 +47,48 @@
 		compatible = "gpio-leds";
 
 		dsl: dsl {
-			label = "vgv7510kw22:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		internet_red {
-			label = "vgv7510kw22:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 		};
 
 		info_red {
-			label = "vgv7510kw22:red:info";
+			label = "red:info";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		power_green: power {
-			label = "vgv7510kw22:green:power";
+			label = "green:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		info_green {
-			label = "vgv7510kw22:green:info";
+			label = "green:info";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		internet_green: internet_green {
-			label = "vgv7510kw22:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi: wifi {
-			label = "vgv7510kw22:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		power_red: power2 {
-			label = "vgv7510kw22:red:power";
+			label = "red:power";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 
 		phone {
-			label = "vgv7510kw22:green:telefon";
+			label = "green:telefon";
 			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
index e82407d7c3..0cb5244dbc 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
@@ -55,60 +55,60 @@
 		compatible = "gpio-leds";
 
 		eco {
-			label = "vgv7519:blue:eco";
+			label = "blue:eco";
 			gpios = <&stp 2 GPIO_ACTIVE_LOW>;
 		};
 		wps_red {
-			label = "vgv7519:red:wps";
+			label = "red:wps";
 			gpios = <&stp 3 GPIO_ACTIVE_LOW>;
 		};
 		wps_green {
-			label = "vgv7519:green:wps";
+			label = "green:wps";
 			gpios = <&stp 4 GPIO_ACTIVE_LOW>;
 		};
 		upgrade {
-			label = "vgv7519:blue:upgrade";
+			label = "blue:upgrade";
 			gpios = <&stp 5 GPIO_ACTIVE_LOW>;
 		};
 		tv {
-			label = "vgv7519:green:tv";
+			label = "green:tv";
 			gpios = <&stp 6 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: internet_green {
-			label = "vgv7519:green:internet";
+			label = "green:internet";
 			gpios = <&stp 7 GPIO_ACTIVE_LOW>;
 		};
 		internet_red {
-			label = "vgv7519:red:internet";
+			label = "red:internet";
 			gpios = <&stp 8 GPIO_ACTIVE_LOW>;
 		};
 		broadband_red {
-			label = "vgv7519:red:broadband";
+			label = "red:broadband";
 			gpios = <&stp 9 GPIO_ACTIVE_LOW>;
 		};
 		broadband_green: broadband_green {
-			label = "vgv7519:green:broadband";
+			label = "green:broadband";
 			gpios = <&stp 10 GPIO_ACTIVE_LOW>;
 		};
 		voice {
-			label = "vgv7519:green:voice";
+			label = "green:voice";
 			gpios = <&stp 11 GPIO_ACTIVE_LOW>;
 		};
 		wireless_red {
-			label = "vgv7519:red:wireless";
+			label = "red:wireless";
 			gpios = <&stp 12 GPIO_ACTIVE_LOW>;
 		};
 		wireless_green: wireless_green {
-			label = "vgv7519:green:wireless";
+			label = "green:wireless";
 			gpios = <&stp 13 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power2 {
-			label = "vgv7519:green:power";
+			label = "green:power";
 			gpios = <&stp 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power {
-			label = "vgv7519:red:power";
+			label = "red:power";
 			gpios = <&stp 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi
index 2c790a488e..b25d11e1c6 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi
@@ -53,38 +53,38 @@
 		compatible = "gpio-leds";
 
 		power_green: power {
-			label = "fritz3370:green:power";
+			label = "green:power";
 			gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		power_red: power2 {
-			label = "fritz3370:red:power";
+			label = "red:power";
 			gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
 		};
 
 		info_red {
-			label = "fritz3370:red:info";
+			label = "red:info";
 			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi: wifi {
-			label = "fritz3370:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 
 		dsl: dsl {
-			label = "fritz3370:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "fritz3370:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 
 		info_green: info_green {
-			label = "fritz3370:green:info";
+			label = "green:info";
 			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
index 9129ef1f70..c9a7b2144b 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
@@ -12,27 +12,27 @@
 };
 
 &power_green {
-	label = "fritz7360-v2:green:power";
+	label = "green:power";
 };
 
 &power_red {
-	label = "fritz7360-v2:red:power";
+	label = "red:power";
 };
 
 &info_green {
-	label = "fritz7360-v2:green:info";
+	label = "green:info";
 };
 
 &wifi {
-	label = "fritz7360-v2:green:wlan";
+	label = "green:wlan";
 };
 
 &info_red {
-	label = "fritz7360-v2:red:info";
+	label = "red:info";
 };
 
 &dect {
-	label = "fritz7360-v2:green:dect";
+	label = "green:dect";
 };
 
 &state_default {
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
index 012300ec57..2311891469 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
@@ -12,27 +12,27 @@
 };
 
 &power_green {
-	label = "fritz7360sl:green:power";
+	label = "green:power";
 };
 
 &power_red {
-	label = "fritz7360sl:red:power";
+	label = "red:power";
 };
 
 &info_green {
-	label = "fritz7360sl:green:info";
+	label = "green:info";
 };
 
 &wifi {
-	label = "fritz7360sl:green:wlan";
+	label = "green:wlan";
 };
 
 &info_red {
-	label = "fritz7360sl:red:info";
+	label = "red:info";
 };
 
 &dect {
-	label = "fritz7360sl:green:dect";
+	label = "green:dect";
 };
 
 &state_default {
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
index a061a482da..496dfcdd3f 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
@@ -12,27 +12,27 @@
 };
 
 &power_green {
-	label = "fritz7362sl:green:power";
+	label = "green:power";
 };
 
 &power_red {
-	label = "fritz7362sl:red:power";
+	label = "red:power";
 };
 
 &info_green {
-	label = "fritz7362sl:green:info";
+	label = "green:info";
 };
 
 &wifi {
-	label = "fritz7362sl:green:wlan";
+	label = "green:wlan";
 };
 
 &info_red {
-	label = "fritz7362sl:red:info";
+	label = "red:info";
 };
 
 &dect {
-	label = "fritz7362sl:green:dect";
+	label = "green:dect";
 };
 
 &state_default {
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
index 43216d66be..8fb5fdb2f6 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
@@ -50,33 +50,33 @@
 		compatible = "gpio-leds";
 
 		power_green: power_green {
-			label = "fritz7412:green:power";
+			label = "green:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		
 		power_red: power_red {
-			label = "fritz7412:red:power";
+			label = "red:power";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		
 		fon {
-			label = "fritz7412:green:fon";
+			label = "green:fon";
 			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 		};
 		
 		dect {
-			label = "fritz7412:green:dect";
+			label = "green:dect";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 		
 		wifi: wifi {
-			label = "fritz7412:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 		
 		info: info {
-			label = "fritz7412:green:info";
+			label = "green:info";
 			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
index a506b7dd13..7cb1a1dccb 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
@@ -56,44 +56,44 @@
 
 		/* broadband-* is a single RGB led */
 		broadband-red {
-			label = "bthomehubv5a:red:broadband";
+			label = "red:broadband";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 		broadband-green {
-			label = "bthomehubv5a:green:broadband";
+			label = "green:broadband";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 		broadband_blue: broadband-blue {
-			label = "bthomehubv5a:blue:broadband";
+			label = "blue:broadband";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		/* wireless-* is a single RGB led */
 		wireless-red {
-			label = "bthomehubv5a:red:wireless";
+			label = "red:wireless";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		wireless-green {
-			label = "bthomehubv5a:green:wireless";
+			label = "green:wireless";
 			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 		};
 		wireless_blue: wireless-blue {
-			label = "bthomehubv5a:blue:wireless";
+			label = "blue:wireless";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		/* power-* is a single RGB led */
 		power_red: power-red {
-			label = "bthomehubv5a:red:power";
+			label = "red:power";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power-green {
-			label = "bthomehubv5a:green:power";
+			label = "green:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_blue: power-blue {
-			label = "bthomehubv5a:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
index 61be0ca2ef..caa9ff093b 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
@@ -75,13 +75,13 @@
 		compatible = "gpio-leds";
 
 		diag_r: diag_r {
-			label = "wbmr300:red:diag";
+			label = "red:diag";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 			default_state = "off";
 		};
 
 		wifi_g: wifi_g {
-			label = "wbmr300:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
@@ -91,52 +91,52 @@
 		};
 
 		router_y: router_y {
-			label = "wbmr300:yellow:router";
+			label = "yellow:router";
 			gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		wifi_y: wifi_y {
-			label = "wbmr300:yellow:wifi";
+			label = "yellow:wifi";
 			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan1: lan1 {
-			label = "wbmr300:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan: wan {
-			label = "wbmr300:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan3: lan3 {
-			label = "wbmr300:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan2: lan2 {
-			label = "wbmr300:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet_g: internet_g {
-			label = "wbmr300:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 34 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet_y: internet_y {
-			label = "wbmr300:yellow:internet";
+			label = "yellow:internet";
 			gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
 		};
 
 		router_g: router_g {
-			label = "wbmr300:green:router";
+			label = "green:router";
 			gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_g: power_g {
-			label = "wbmr300:green:power";
+			label = "green:power";
 			gpios = <&gpio 49 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
index 4fbc1ac496..79d7a5b410 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
@@ -44,40 +44,40 @@
 		compatible = "gpio-leds";
 
 		power: power {
-			label = "easy80920:green:power";
+			label = "green:power";
 			gpios = <&stp 9 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		warning {
-			label = "easy80920:green:warning";
+			label = "green:warning";
 			gpios = <&stp 22 GPIO_ACTIVE_HIGH>;
 		};
 		fxs1 {
-			label = "easy80920:green:fxs1";
+			label = "green:fxs1";
 			gpios = <&stp 21 GPIO_ACTIVE_HIGH>;
 		};
 		fxs2 {
-			label = "easy80920:green:fxs2";
+			label = "green:fxs2";
 			gpios = <&stp 20 GPIO_ACTIVE_HIGH>;
 		};
 		fxo {
-			label = "easy80920:green:fxo";
+			label = "green:fxo";
 			gpios = <&stp 19 GPIO_ACTIVE_HIGH>;
 		};
 		led_usb1: usb1 {
-			label = "easy80920:green:usb1";
+			label = "green:usb1";
 			gpios = <&stp 18 GPIO_ACTIVE_HIGH>;
 		};
 		led_usb2: usb2 {
-			label = "easy80920:green:usb2";
+			label = "green:usb2";
 			gpios = <&stp 15 GPIO_ACTIVE_HIGH>;
 		};
 		sd {
-			label = "easy80920:green:sd";
+			label = "green:sd";
 			gpios = <&stp 14 GPIO_ACTIVE_HIGH>;
 		};
 		wps {
-			label = "easy80920:green:wps";
+			label = "green:wps";
 			gpios = <&stp 12 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
index d6dd5edfe4..3662433040 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
@@ -57,29 +57,29 @@
 		compatible = "gpio-leds";
 
 		power_amber: power_amber {
-			label = "dm200:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 		power_green: power_green {
-			label = "dm200:green:power";
+			label = "green:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan_amber {
-			label = "dm200:amber:lan";
+			label = "amber:lan";
 			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 		};
 		lan_green {
-			label = "dm200:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 		};
 
 		dsl_amber {
-			label = "dm200:amber:dsl";
+			label = "amber:dsl";
 			gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
 		};
 		dsl_green: dsl_green {
-			label = "dm200:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
index 725aa759d2..acad866199 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
@@ -8,7 +8,7 @@
 
 	gpio-leds {
 		wifi2 {
-			label = "tdw8980:green:wlan5ghz";
+			label = "green:wlan5ghz";
 			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
index eabbc0257f..d057a8c17b 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
@@ -56,24 +56,24 @@
 			power is not controllable via gpio
 		*/
 		dsl: dsl {
-			label = "tdw89x0:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
 		};
 		internet: internet {
-			label = "tdw89x0:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_usb0: usb0 {
-			label = "tdw89x0:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
 		};
 		led_usb2: usb2 {
-			label = "tdw89x0:green:usb2";
+			label = "green:usb2";
 			gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
 		};
 		wps: wps {
-			label = "tdw89x0:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
 		};
 	};
@@ -82,7 +82,7 @@
 		compatible = "gpio-leds";
 
 		wifi: wifi {
-			label = "tdw89x0:green:wifi";
+			label = "green:wifi";
 			gpios = <&ath9k 0 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
index 98f2282579..62e32f81d6 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
@@ -56,36 +56,36 @@
 	leds {
 		compatible = "gpio-leds";
 		power: power {
-			label = "vr200:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl: dsl {
-			label = "vr200:blue:dsl";
+			label = "blue:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet: internet {
-			label = "vr200:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "vr200:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
 		};
 		eth {
-			label = "vr200:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
 		};
 		wlan {
-			label = "vr200:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
 		};
 		wlan5g: wifi {
-			label = "vr200:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 		led_wps {
-			label = "vr200:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 		};
 	};	
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts
index 2e25a72a83..81195988d0 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts
@@ -56,36 +56,36 @@
 	leds {
 		compatible = "gpio-leds";
 		power: power {
-			label = "vr200v:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl: dsl {
-			label = "vr200v:blue:dsl";
+			label = "blue:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet: internet {
-			label = "vr200v:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "vr200v:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
 		};
 		eth {
-			label = "vr200v:blue:lan";
+			label = "blue:lan";
 			gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
 		};
 		wlan {
-			label = "vr200v:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
 		};
 		wlan5g: wifi {
-			label = "vr200v:blue:wlan5g";
+			label = "blue:wlan5g";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 		phone {
-			label = "vr200v:blue:phone";
+			label = "blue:phone";
 			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 		};
 	};	
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
index fc19468f77..4b1ff7023c 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
@@ -13,11 +13,11 @@
 
 	leds {
 		led_usb1: usb1 {
-			label = "p2812hnuf1:green:usb1";
+			label = "green:usb1";
 			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 		led_usb2: usb2 {
-			label = "p2812hnuf1:green:usb2";
+			label = "green:usb2";
 			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
index 6c30a91553..c4f30f5ffc 100644
--- a/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
+++ b/target/linux/lantiq/files-4.19/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
@@ -47,52 +47,52 @@
 		compatible = "gpio-leds";
 
 		internet_red {
-			label = "p2812hnufx:red:internet";
+			label = "red:internet";
 			gpios = <&stp 16 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: internet_green {
-			label = "p2812hnufx:green:internet";
+			label = "green:internet";
 			gpios = <&stp 17 GPIO_ACTIVE_LOW>;
 		};
 		dsl_green: dsl_green {
-			label = "p2812hnufx:green:dsl";
+			label = "green:dsl";
 			gpios = <&stp 18 GPIO_ACTIVE_LOW>;
 		};
 		dsl_orange {
-			label = "p2812hnufx:orange:dsl";
+			label = "orange:dsl";
 			gpios = <&stp 19 GPIO_ACTIVE_LOW>;
 		};
 		wireless_orange {
-			label = "p2812hnufx:orange:wlan";
+			label = "orange:wlan";
 			gpios = <&stp 20 GPIO_ACTIVE_LOW>;
 		};
 		wireless_green: wireless_green {
-			label = "p2812hnufx:green:wlan";
+			label = "green:wlan";
 			gpios = <&stp 21 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power {
-			label = "p2812hnufx:red:power";
+			label = "red:power";
 			gpios = <&stp 22 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power2 {
-			label = "p2812hnufx:green:power";
+			label = "green:power";
 			gpios = <&stp 23 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		phone1 {
-			label = "p2812hnufx:green:phone";
+			label = "green:phone";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 		phone1warn {
-			label = "p2812hnufx:orange:phone";
+			label = "orange:phone";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 		phone2warn {
-			label = "p2812hnufx:orange:phone2";
+			label = "orange:phone2";
 			gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
 		};
 		phone2 {
-			label = "p2812hnufx:green:phone2";
+			label = "green:phone2";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
index d91a37ff12..67c6e87bcd 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_allnet_all0333cj.dts
@@ -28,27 +28,27 @@
 
 		/* power led: red=off, green=on */
 		power: power {
-			label = "all0333cj:green:power";
+			label = "green:power";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		lan: lan {
-			label = "all0333cj:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		dsl: dsl {
-			label = "all0333cj:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		online_green: online {
-			label = "all0333cj:green:online";
+			label = "green:online";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 		online_red {
-			label = "all0333cj:red:online";
+			label = "red:online";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts
index 878f8ccda2..144667ffb6 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/amazonse_netgear_dgn1000b.dts
@@ -49,27 +49,27 @@
 	leds {
 		compatible = "gpio-leds";
 		dsl: dsl {
-			label = "dgn1000b:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		online_green: online {
-			label = "dgn1000b:green:online";
+			label = "green:online";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		online2 {
-			label = "dgn1000b:red:online";
+			label = "red:online";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		wps {
-			label = "dgn1000b:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 		power: power {
-			label = "dgn1000b:green:power";
+			label = "green:power";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
index 6cb693b2e2..4a4a06514f 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7312.dts
@@ -45,24 +45,24 @@
 		compatible = "gpio-leds";
 
 		power: power {
-			label = "fritz7312:green:power";
+			label = "green:power";
 			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		voice {
-			label = "fritz7312:green:fon";
+			label = "green:fon";
 			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 		dect {
-			label = "fritz7312:green:dect";
+			label = "green:dect";
 			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 		wlan: wlan {
-			label = "fritz7312:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
 		};
 		info_green: info_green {
-			label = "fritz7312:green:info";
+			label = "green:info";
 			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
index 74c8add71c..9fbac6fa12 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_avm_fritz7320.dts
@@ -44,28 +44,28 @@
 	leds {
 		compatible = "gpio-leds";
 		power: power {
-			label = "fritz7320:green:power";
+			label = "green:power";
 			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		voice {
-			label = "fritz7320:green:fon";
+			label = "green:fon";
 			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 		dect {
-			label = "fritz7320:green:dect";
+			label = "green:dect";
 			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 		wlan: wlan {
-			label = "fritz7320:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
 		};
 		info_green: info_green {
-			label = "fritz7320:green:info";
+			label = "green:info";
 			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 		info_red {
-			label = "fritz7320:red:info";
+			label = "red:info";
 			gpios = <&gpio 45 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
index 40d1e597c5..61a39f9955 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_bt_homehub-v3a.dts
@@ -49,42 +49,42 @@
 		compatible = "gpio-leds";
 
 		wireless-red {
-			label = "bthomehubv3a:red:wireless";
+			label = "red:wireless";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		wireless-orange {
-			label = "bthomehubv3a:orange:wireless";
+			label = "orange:wireless";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wireless_blue: wireless-blue {
-			label = "bthomehubv3a:blue:wireless";
+			label = "blue:wireless";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 
 		broadband-red {
-			label = "bthomehubv3a:red:broadband";
+			label = "red:broadband";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 		broadband-orange {
-			label = "bthomehubv3a:orange:broadband";
+			label = "orange:broadband";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 		broadband_blue: broadband-blue {
-			label = "bthomehubv3a:blue:broadband";
+			label = "blue:broadband";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		power_red: power-red {
-			label = "bthomehubv3a:red:power";
+			label = "red:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		power_orange: power-orange {
-			label = "bthomehubv3a:orange:power";
+			label = "orange:power";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_blue: power-blue {
-			label = "bthomehubv3a:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
index c55d2fdd1e..e240f0c576 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_buffalo_wbmr-hp-g300h.dts
@@ -57,40 +57,40 @@
 		compatible = "gpio-leds";
 
 		power_green: power {
-			label = "wbmr:green:power";
+			label = "green:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
-			label = "wbmr:red:power";
+			label = "red:power";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		security {
-			label = "wbmr:yellow:security";
+			label = "yellow:security";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "wbmr:green:wireless";
+			label = "green:wireless";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "wbmr:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 		online_green: online {
-			label = "wbmr:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
-			label = "wbmr:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
 		};
 		movie {
-			label = "wbmr:blue:movie";
+			label = "blue:movie";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "wbmr:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
index 64fae44e7f..18168230b6 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_netgear_dgn3500.dtsi
@@ -67,40 +67,40 @@
 	leds {
 		compatible = "gpio-leds";
 		internet: internet {
-			label = "dgn3500:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		internet2 {
-			label = "dgn3500:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 30 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "dgn3500:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "dgn3500:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power {
-			label = "dgn3500:green:power";
+			label = "green:power";
 			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
-			label = "dgn3500:red:power";
+			label = "red:power";
 			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
 		};
 		wifi_green: wifi {
-			label = "dgn3500:green:wireless";
+			label = "green:wireless";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		wifi2 {
-			label = "dgn3500:amber:wireless";
+			label = "amber:wireless";
 			gpios = <&gpio 51 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "dgn3500:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 52 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
index f19ce3ef8b..486261d742 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zte_h201l.dts
@@ -52,32 +52,32 @@
 		compatible = "gpio-leds";
 
 		power_green: power {
-			label = "h201l:green:power";
+			label = "green:power";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		online: online {
-			label = "h201l:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 37 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "h201l:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		phone {
-			label = "h201l:green:phone";
+			label = "green:phone";
 			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "h201l:green:wps";
+			label = "green:wps";
 			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "h201l:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "h201l:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
index 888c053763..2177726d81 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/ar9_zyxel_p-2601hn.dts
@@ -46,40 +46,40 @@
 		compatible = "gpio-leds";
 
 		power_green: power {
-			label = "p2601hnfx:green:power";
+			label = "green:power";
 			gpios = <&stp 11 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
-			label = "p2601hnfx:red:power";
+			label = "red:power";
 			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 		};
 		online: online {
-			label = "p2601hnfx:green:internet";
+			label = "green:internet";
 			gpios = <&stp 13 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
-			label = "p2601hnfx:red:internet";
+			label = "red:internet";
 			gpios = <&stp 12 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "p2601hnfx:green:dsl";
+			label = "green:dsl";
 			gpios = <&stp 14 GPIO_ACTIVE_LOW>;
 		};
 		phone {
-			label = "p2601hnfx:green:phone";
+			label = "green:phone";
 			gpios = <&stp 9 GPIO_ACTIVE_LOW>;
 		};
 		phone2 {
-			label = "p2601hnfx:orange:phone";
+			label = "orange:phone";
 			gpios = <&stp 8 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "p2601hnfx:green:wireless";
+			label = "green:wireless";
 			gpios = <&stp 15 GPIO_ACTIVE_LOW>;
 		};
 		wifi2 {
-			label = "p2601hnfx:orange:wireless";
+			label = "orange:wireless";
 			gpios = <&stp 10 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
index c990978e40..18a2bfbe83 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4519pw.dts
@@ -47,60 +47,60 @@
 		compatible = "gpio-leds";
 
 		power_green: power {
-			label = "arv4519pw:green:power";
+			label = "green:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power2 {
-			label = "arv4519pw:red:power";
+			label = "red:power";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv4519pw:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "arv4519pw:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: online {
-			label = "arv4519pw:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
-			label = "arv4519pw:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "arv4519pw:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		voip {
-			label = "arv4519pw:green:voip";
+			label = "green:voip";
 			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
-			label = "arv4519pw:green:phone1";
+			label = "green:phone1";
 			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv4519pw:green:phone2";
+			label = "green:phone2";
 			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
-			label = "arv4519pw:green:line";
+			label = "green:line";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
-			label = "arv4519pw:green:wps";
+			label = "green:wps";
 			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "arv4519pw:orange:wps";
+			label = "orange:wps";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wps3 {
-			label = "arv4519pw:red:wps";
+			label = "red:wps";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
index cde1d5df2a..4c76350bdc 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4520pw.dts
@@ -47,63 +47,63 @@
 		compatible = "gpio-leds";
 
 		power_blue: power {
-			label = "arv4520pw:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl: dsl {
-			label = "arv4520pw:blue:dsl";
+			label = "blue:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet_blue: internet {
-			label = "arv4520pw:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power2 {
-			label = "arv4520pw:red:power";
+			label = "red:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "arv4520pw:yellow:wps";
+			label = "yellow:wps";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
-			label = "arv4520pw:red:wps";
+			label = "red:wps";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		/*
 			wps green is missing
 		*/
 		fxs1 {
-			label = "arv4520pw:blue:telefon1";
+			label = "blue:telefon1";
 			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv4520pw:blue:telefon2";
+			label = "blue:telefon2";
 			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		isdn {
-			label = "arv4520pw:blue:isdn";
+			label = "blue:isdn";
 			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
-			label = "arv4520pw:blue:line";
+			label = "blue:line";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		voice {
-			label = "arv4520pw:blue:sprache";
+			label = "blue:sprache";
 			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "arv4520pw:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv4520pw:blue:wifi";
+			label = "blue:wifi";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		internet2 {
-			label = "arv4520pw:red:internet";
+			label = "red:internet";
 			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 		/*
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
index 0d3c606b37..df44abf92f 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv4525pw.dts
@@ -51,23 +51,23 @@
 	leds {
 		compatible = "gpio-leds";
 		fxo {
-			label = "arv4525pw:green:festnetz";
+			label = "green:festnetz";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		fxs {
-			label = "arv4525pw:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "arv4525pw:green:t-dsl";
+			label = "green:t-dsl";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv4525pw:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		online: online {
-			label = "arv4525pw:green:online";
+			label = "green:online";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
index 78d7a28b5b..bc04677d46 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv452cqw.dts
@@ -57,56 +57,56 @@
 	leds {
 		compatible = "gpio-leds";
 		power_blue: power0 {
-			label = "arv452cqw:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl_blue: dsl {
-			label = "arv452cqw:blue:dsl";
+			label = "blue:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		isdn {
-			label = "arv452cqw:blue:isdn";
+			label = "blue:isdn";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power1 {
-			label = "arv452cqw:red:power";
+			label = "red:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "arv452cqw:blue:wps";
+			label = "blue:wps";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		wps1 {
-			label = "arv452cqw:yellow:wps";
+			label = "yellow:wps";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
-			label = "arv452cqw:blue:telefon1";
+			label = "blue:telefon1";
 			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv452cqw:blue:telefon2";
+			label = "blue:telefon2";
 			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
-			label = "arv452cqw:red:wps";
+			label = "red:wps";
 			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
-			label = "arv452cqw:blue:line";
+			label = "blue:line";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		voice {
-			label = "arv452cqw:blue:sprache";
+			label = "blue:sprache";
 			gpios = <&gpiomm 4 1>;
 		};
 		led_usb: usb {
-			label = "arv452cqw:blue:usb";
+			label = "blue:usb";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv452cqw:blue:wlan";
+			label = "blue:wlan";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		/*
@@ -114,11 +114,11 @@
 			dsl2 and dsl3 are not referenced in manual
 		*/
 		dsl2 {
-			label = "arv452cqw:yellow:dsl";
+			label = "yellow:dsl";
 			gpios = <&gpiomm 8 GPIO_ACTIVE_LOW>;
 		};
 		dsl3 {
-			label = "arv452cqw:red:dsl";
+			label = "red:dsl";
 			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
index 13ddfa730b..87954fef02 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7506pw11.dts
@@ -45,40 +45,40 @@
 	leds {
 		compatible = "gpio-leds";
 		wlan: wlan {
-			label = "arv7506pw11:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		power: power {
-			label = "arv7506pw11:green:power";
+			label = "green:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl: dsl {
-			label = "arv7506pw11:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		internet: internet {
-			label = "arv7506pw11:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power_red {
-			label = "arv7506pw11:red:power";
+			label = "red:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		internet_red {
-			label = "arv7506pw11:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		info {
-			label = "arv7506pw11:green:info";
+			label = "green:info";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		telefon {
-			label = "arv7506pw11:green:telefon";
+			label = "green:telefon";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		info_red {
-			label = "arv7506pw11:red:info";
+			label = "red:info";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
index 867205b65e..f2592961cb 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7518pw.dts
@@ -46,60 +46,60 @@
 	leds {
 		compatible = "gpio-leds";
 		power_green: power {
-			label = "arv7518pw:green:power";
+			label = "green:power";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		dsl: dsl {
-			label = "arv7518pw:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		online_green: online {
-			label = "arv7518pw:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv7518pw:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power2 {
-			label = "arv7518pw:red:power";
+			label = "red:power";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 		};
 		online2 {
-			label = "arv7518pw:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		led_usb: usb {
-			label = "arv7518pw:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		voice {
-			label = "arv7518pw:green:voip";
+			label = "green:voip";
 			gpios = <&gpiomm 0 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
-			label = "arv7518pw:green:phone1";
+			label = "green:phone1";
 			gpios = <&gpiomm 1 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv7518pw:green:phone2";
+			label = "green:phone2";
 			gpios = <&gpiomm 2 GPIO_ACTIVE_LOW>;
 		};
 		unlabeled {
-			label = "arv7518pw:amber:unlabeled";
+			label = "amber:unlabeled";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wps {
-			label = "arv7518pw:amber:wps";
+			label = "amber:wps";
 			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		wps2 {
-			label = "arv7518pw:green:wps";
+			label = "green:wps";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		wps3 {
-			label = "arv7518pw:red:wps";
+			label = "red:wps";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
index c9fd15f901..1f1adc4738 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv7525pw.dts
@@ -45,28 +45,28 @@
 	leds {
 		compatible = "gpio-leds";
 		power_green: power {
-			label = "arv7525pw:green:power";
+			label = "green:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power1 {
-			label = "arv7525pw:red:power";
+			label = "red:power";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		online: online {
-			label = "arv7525pw:green:online";
+			label = "green:online";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		voice {
-			label = "arv7525pw:green:telefonie";
+			label = "green:telefonie";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 		voice2 {
-			label = "arv7525pw:red:telefonie";
+			label = "red:telefonie";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv7525pw:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
index 56d3854d15..d0f5c38b39 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw.dts
@@ -57,52 +57,52 @@
 	leds {
 		compatible = "gpio-leds";
 		power_blue: power1 {
-			label = "arv752dpw:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 		internet_red: internet {
-			label = "arv752dpw:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		message {
-			label = "arv752dpw:red:message";
+			label = "red:message";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power {
-			label = "arv752dpw:red:power";
+			label = "red:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		voice1 {
-			label = "arv752dpw:red:voice";
+			label = "red:voice";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		umts: umts {
-			label = "arv752dpw:red:umts";
+			label = "red:umts";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv752dpw:red:wifi";
+			label = "red:wifi";
 			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
-			label = "arv752dpw:green:tae-n";
+			label = "green:tae-n";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv752dpw:green:tae-u";
+			label = "green:tae-u";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
-			label = "arv752dpw:green:isdn";
+			label = "green:isdn";
 			gpios = <&gpiomm 7 GPIO_ACTIVE_LOW>;
 		};
 		internet2 {
-			label = "arv752dpw:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpiomm 8 GPIO_ACTIVE_LOW>;
 		};
 		voice2 {
-			label = "arv752dpw:blue:voice";
+			label = "blue:voice";
 			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
index f1df2b6096..72483e4749 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv752dpw22.dts
@@ -55,68 +55,68 @@
 	leds {
 		compatible = "gpio-leds";
 		power_blue: power1 {
-			label = "arv752dpw22:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 		internet_red: internet {
-			label = "arv752dpw22:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 		message {
-			label = "arv752dpw22:red:message";
+			label = "red:message";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power {
-			label = "arv752dpw22:red:power";
+			label = "red:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		voice1 {
-			label = "arv752dpw22:red:voice";
+			label = "red:voice";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		umts: umts {
-			label = "arv752dpw22:red:umts";
+			label = "red:umts";
 			gpios = <&gpiomm 3 GPIO_ACTIVE_LOW>;
 		};
 		wifi: wifi {
-			label = "arv752dpw22:red:wifi";
+			label = "red:wifi";
 			gpios = <&gpiomm 4 GPIO_ACTIVE_LOW>;
 		};
 		fxs1 {
-			label = "arv752dpw22:green:tae-n";
+			label = "green:tae-n";
 			gpios = <&gpiomm 5 GPIO_ACTIVE_LOW>;
 		};
 		fxs2 {
-			label = "arv752dpw22:green:tae-u";
+			label = "green:tae-u";
 			gpios = <&gpiomm 6 GPIO_ACTIVE_LOW>;
 		};
 		fxo {
-			label = "arv752dpw22:green:isdn";
+			label = "green:isdn";
 			gpios = <&gpiomm 7 GPIO_ACTIVE_LOW>;
 		};
 		internet2 {
-			label = "arv752dpw22:blue:internet";
+			label = "blue:internet";
 			gpios = <&gpiomm 8 GPIO_ACTIVE_LOW>;
 		};
 		voice2 {
-			label = "arv752dpw22:blue:voice";
+			label = "blue:voice";
 			gpios = <&gpiomm 9 GPIO_ACTIVE_LOW>;
 		};
 		eth1 {
-			 label = "arv752dpw22:green:lan1";
+			 label = "green:lan1";
 			 gpios = <&gpiomm 11 GPIO_ACTIVE_LOW>;
 		};
 		eth2 {
-			label = "arv752dpw22:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpiomm 12 GPIO_ACTIVE_LOW>;
 		};
 		eth3 {
-			label = "arv752dpw22:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpiomm 13 GPIO_ACTIVE_LOW>;
 		};
 		eth4 {
-			label = "arv752dpw22:green:lan4";
+			label = "green:lan4";
 			gpios = <&gpiomm 14 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
index b24ae6987a..5986279e6e 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_arcadyan_arv8539pw22.dts
@@ -47,27 +47,27 @@
 		compatible = "gpio-leds";
 
 		power_green: power-green {
-			label = "arv8539pw22:green:power";
+			label = "green:power";
 			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power-red {
-			label = "arv8539pw22:red:power";
+			label = "red:power";
 			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 		};
 
 		dsl_green: dsl-green {
-			label = "arv8539pw22:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		online_green: online-green {
-			label = "arv8539pw22:green:online";
+			label = "green:online";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		wireless_green: wireless-green {
-			label = "arv8539pw22:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 		/*
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
index fb35af527e..0147b3ffd1 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/danube_bt_homehub-v2b.dts
@@ -50,52 +50,52 @@
 		compatible = "gpio-leds";
 
 		upgrading-orange {
-			label = "bthomehubv2b:orange:upgrading";
+			label = "orange:upgrading";
 			gpios = <&gpios 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		phone-orange {
-			label = "bthomehubv2b:orange:phone";
+			label = "orange:phone";
 			gpios = <&gpios 6 GPIO_ACTIVE_HIGH>;
 		};
 		phone-blue {
-			label = "bthomehubv2b:blue:phone";
+			label = "blue:phone";
 			gpios = <&gpios 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		wireless-orange {
-			label = "bthomehubv2b:orange:wireless";
+			label = "orange:wireless";
 			gpios = <&gpios 8 GPIO_ACTIVE_HIGH>;
 		};
 		wireless_blue: wireless-blue {
-			label = "bthomehubv2b:blue:wireless";
+			label = "blue:wireless";
 			gpios = <&gpios 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		broadband-red {
-			label = "bthomehubv2b:red:broadband";
+			label = "red:broadband";
 			gpios = <&gpios 10 GPIO_ACTIVE_HIGH>;
 		};
 		broadband-orange {
-			label = "bthomehubv2b:orange:broadband";
+			label = "orange:broadband";
 			gpios = <&gpios 11 GPIO_ACTIVE_HIGH>;
 		};
 		broadband_blue: broadband-blue {
-			label = "bthomehubv2b:blue:broadband";
+			label = "blue:broadband";
 			gpios = <&gpios 12 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_red: power-red {
-			label = "bthomehubv2b:red:power";
+			label = "red:power";
 			gpios = <&gpios 13 GPIO_ACTIVE_HIGH>;
 		};
 		power_orange: power-orange {
-			label = "bthomehubv2b:orange:power";
+			label = "orange:power";
 			gpios = <&gpios 14 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		power_blue: power-blue {
-			label = "bthomehubv2b:blue:power";
+			label = "blue:power";
 			gpios = <&gpios 15 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
index c4f74dad94..fa46dc30fd 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88388.dts
@@ -39,52 +39,52 @@
 		pinctrl-0 = <&led_pins &bootled_pins>;
 
 		GPON {
-			label = "easy88388:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 		};
 		TEST {
-			label = "easy88388:green:test";
+			label = "green:test";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 		};
 		STATUS {
-			label = "easy88388:green:status";
+			label = "green:status";
 			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
 		};
 		ERROR {
-			label = "easy88388:red:error";
+			label = "red:error";
 			gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
 		};
 
 		DSL1 {
-			label = "easy88388:dsl:1";
+			label = "dsl:1";
 			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 		};
 		DSL2 {
-			label = "easy88388:dsl:2";
+			label = "dsl:2";
 			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 		};
 		DSL3 {
-			label = "easy88388:dsl:3";
+			label = "dsl:3";
 			gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
 		};
 		DSL4 {
-			label = "easy88388:dsl:4";
+			label = "dsl:4";
 			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
 		};
 		DSL5 {
-			label = "easy88388:dsl:5";
+			label = "dsl:5";
 			gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
 		};
 		DSL6 {
-			label = "easy88388:dsl:6";
+			label = "dsl:6";
 			gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
 		};
 		DSL7 {
-			label = "easy88388:dsl:7";
+			label = "dsl:7";
 			gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
 		};
 		DSL8 {
-			label = "easy88388:dsl:8";
+			label = "dsl:8";
 			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
index 13530177cf..d6591aa10e 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy88444.dts
@@ -38,32 +38,32 @@
 		pinctrl-0 = <&led_pins &bootled_pins>;
 
 		GPON {
-			label = "easy88444:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 		};
 		TEST {
-			label = "easy88444:green:test";
+			label = "green:test";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 		};
 		STATUS {
-			label = "easy88444:green:status";
+			label = "green:status";
 			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		GFAST1 {
-			label = "easy88444:gfast:1";
+			label = "gfast:1";
 			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 		};
 		GFAST2 {
-			label = "easy88444:gfast:2";
+			label = "gfast:2";
 			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 		};
 		GFAST3 {
-			label = "easy88444:gfast:3";
+			label = "gfast:3";
 			gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
 		};
 		GFAST4 {
-			label = "easy88444:gfast:4";
+			label = "gfast:4";
 			gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi
index 9fc7630f22..e25145d869 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98000.dtsi
@@ -17,32 +17,32 @@
 		pinctrl-0 = <&bootled_pins>;
 
 		LED_0 {
-			label = "easy98000:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_1 {
-			label = "easy98000:red:gpon";
+			label = "red:gpon";
 			gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_2 {
-			label = "easy98000:green:gpon_tx";
+			label = "green:gpon_tx";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_3 {
-			label = "easy98000:green:gpon_rx";
+			label = "green:gpon_rx";
 			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_4 {
-			label = "easy98000:green:voice";
+			label = "green:voice";
 			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_5 {
-			label = "easy98000:green:status";
+			label = "green:status";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
index 0b5181e374..bad808e9bf 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020-v18.dts
@@ -38,27 +38,27 @@
 		pinctrl-0 = <&led_pins &bootled_pins>;
 
 		GPON {
-			label = "easy98020:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		TEST {
-			label = "easy98020:green:test";
+			label = "green:test";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		ETH {
-			label = "easy98020:green:status";
+			label = "green:status";
 			gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		VOICE {
-			label = "easy98020:green:voice";
+			label = "green:voice";
 			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		VIDEO {
-			label = "easy98020:green:video";
+			label = "green:video";
 			gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
index 29456da3c5..2c0a51aa7b 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98020.dts
@@ -38,45 +38,45 @@
 		pinctrl-0 = <&bootled_pins>, <&led_pins>;
 
 		GPON {
-			label = "easy98020:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		TEST {
-			label = "easy98020:green:test";
+			label = "green:test";
 			gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		ETH {
-			label = "easy98020:green:status";
+			label = "green:status";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		VOICE {
-			label = "easy98020:green:voice";
+			label = "green:voice";
 			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		VIDEO {
-			label = "easy98020:green:video";
+			label = "green:video";
 			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		GE0_ACT {
-			label = "easy98020:ge0_act";
+			label = "ge0_act";
 			gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 		};
 		GE0_LINK {
-			label = "easy98020:ge0_link";
+			label = "ge0_link";
 			gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
 		};
 		GE1_ACT {
-			label = "easy98020:ge1_act";
+			label = "ge1_act";
 			gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
 		};
 		GE1_LINK {
-			label = "easy98020:ge1_link";
+			label = "ge1_link";
 			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
index 57484ca6d4..2cc70e6e40 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_easy98021.dts
@@ -50,27 +50,27 @@
 		pinctrl-0 = <&led_pins &bootled_pins>;
 
 		GPON {
-			label = "easy98021:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		TEST {
-			label = "easy98021:red:test";
+			label = "red:test";
 			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		ETH {
-			label = "easy98021:green:status";
+			label = "green:status";
 			gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		VOICE {
-			label = "easy98021:green:voice";
+			label = "green:voice";
 			gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		SIMCARD {
-			label = "easy98021:green:simcard";
+			label = "green:simcard";
 			gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
index 09ac4f5490..611b02f8b3 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/falcon_lantiq_falcon-mdu.dts
@@ -22,27 +22,27 @@
 		pinctrl-0 = <&bootled_pins>;
 
 		LED_0 {
-			label = "mdu:green:gpon";
+			label = "green:gpon";
 			gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_1 {
-			label = "mdu:green:status";
+			label = "green:status";
 			gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_2 {
-			label = "mdu:green:2";
+			label = "green:2";
 			gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_3 {
-			label = "mdu:green:3";
+			label = "green:3";
 			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		LED_4 {
-			label = "mdu:green:4";
+			label = "green:4";
 			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
index 52b9287528..a95f3faa00 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_alphanetworks_asl56026.dts
@@ -40,19 +40,19 @@
 		compatible = "gpio-leds";
 
 		dsl: dsl {
-			label = "asl56026:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 		};
 
 		/* power-* is a bicolour led */
 		power_green: power_green {
-			label = "asl56026:green:power";
+			label = "green:power";
 			gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		power_red: power_red {
-			label = "asl56026:red:power";
+			label = "red:power";
 			gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
index 15e965e5af..9da2649833 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_arv7519rw22.dts
@@ -50,32 +50,32 @@
 		compatible = "gpio-leds";
 
 		lan_green {
-			label = "arv7519rw22:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 		internet_red {
-			label = "arv7519rw22:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power_green {
-			label = "arv7519rw22:green:power";
+			label = "green:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		alarm_blue {
-			label = "arv7519rw22:blue:alarm";
+			label = "blue:alarm";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 		internet_orange {
-			label = "arv7519rw22:orange:internet";
+			label = "orange:internet";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: internet_green {
-			label = "arv7519rw22:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 		voice_green {
-			label = "arv7519rw22:green:voice";
+			label = "green:voice";
 			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
index 8aba447b2b..e7c5532145 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vg3503j.dts
@@ -39,15 +39,15 @@
 		compatible = "gpio-leds";
 
 		power_red: power2 {
-			label = "vg3503j:red:power";
+			label = "red:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 		dsl: dsl {
-			label = "vg3503j:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power {
-			label = "vg3503j:green:power";
+			label = "green:power";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
index 017e473a04..a6206f4a87 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7510kw22.dtsi
@@ -47,48 +47,48 @@
 		compatible = "gpio-leds";
 
 		dsl: dsl {
-			label = "vgv7510kw22:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		internet_red {
-			label = "vgv7510kw22:red:internet";
+			label = "red:internet";
 			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 		};
 
 		info_red {
-			label = "vgv7510kw22:red:info";
+			label = "red:info";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		power_green: power {
-			label = "vgv7510kw22:green:power";
+			label = "green:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		info_green {
-			label = "vgv7510kw22:green:info";
+			label = "green:info";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		internet_green: internet_green {
-			label = "vgv7510kw22:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi: wifi {
-			label = "vgv7510kw22:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
 		};
 
 		power_red: power2 {
-			label = "vgv7510kw22:red:power";
+			label = "red:power";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 
 		phone {
-			label = "vgv7510kw22:green:telefon";
+			label = "green:telefon";
 			gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
index e82407d7c3..0cb5244dbc 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_arcadyan_vgv7519.dtsi
@@ -55,60 +55,60 @@
 		compatible = "gpio-leds";
 
 		eco {
-			label = "vgv7519:blue:eco";
+			label = "blue:eco";
 			gpios = <&stp 2 GPIO_ACTIVE_LOW>;
 		};
 		wps_red {
-			label = "vgv7519:red:wps";
+			label = "red:wps";
 			gpios = <&stp 3 GPIO_ACTIVE_LOW>;
 		};
 		wps_green {
-			label = "vgv7519:green:wps";
+			label = "green:wps";
 			gpios = <&stp 4 GPIO_ACTIVE_LOW>;
 		};
 		upgrade {
-			label = "vgv7519:blue:upgrade";
+			label = "blue:upgrade";
 			gpios = <&stp 5 GPIO_ACTIVE_LOW>;
 		};
 		tv {
-			label = "vgv7519:green:tv";
+			label = "green:tv";
 			gpios = <&stp 6 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: internet_green {
-			label = "vgv7519:green:internet";
+			label = "green:internet";
 			gpios = <&stp 7 GPIO_ACTIVE_LOW>;
 		};
 		internet_red {
-			label = "vgv7519:red:internet";
+			label = "red:internet";
 			gpios = <&stp 8 GPIO_ACTIVE_LOW>;
 		};
 		broadband_red {
-			label = "vgv7519:red:broadband";
+			label = "red:broadband";
 			gpios = <&stp 9 GPIO_ACTIVE_LOW>;
 		};
 		broadband_green: broadband_green {
-			label = "vgv7519:green:broadband";
+			label = "green:broadband";
 			gpios = <&stp 10 GPIO_ACTIVE_LOW>;
 		};
 		voice {
-			label = "vgv7519:green:voice";
+			label = "green:voice";
 			gpios = <&stp 11 GPIO_ACTIVE_LOW>;
 		};
 		wireless_red {
-			label = "vgv7519:red:wireless";
+			label = "red:wireless";
 			gpios = <&stp 12 GPIO_ACTIVE_LOW>;
 		};
 		wireless_green: wireless_green {
-			label = "vgv7519:green:wireless";
+			label = "green:wireless";
 			gpios = <&stp 13 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power2 {
-			label = "vgv7519:green:power";
+			label = "green:power";
 			gpios = <&stp 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_red: power {
-			label = "vgv7519:red:power";
+			label = "red:power";
 			gpios = <&stp 15 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi
index 2c790a488e..b25d11e1c6 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz3370-rev2.dtsi
@@ -53,38 +53,38 @@
 		compatible = "gpio-leds";
 
 		power_green: power {
-			label = "fritz3370:green:power";
+			label = "green:power";
 			gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		power_red: power2 {
-			label = "fritz3370:red:power";
+			label = "red:power";
 			gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
 		};
 
 		info_red {
-			label = "fritz3370:red:info";
+			label = "red:info";
 			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi: wifi {
-			label = "fritz3370:green:wlan";
+			label = "green:wlan";
 			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 
 		dsl: dsl {
-			label = "fritz3370:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
 		};
 
 		lan {
-			label = "fritz3370:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 
 		info_green: info_green {
-			label = "fritz3370:green:info";
+			label = "green:info";
 			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
index 309f402df2..3bd6ff0ee7 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360-v2.dts
@@ -7,30 +7,6 @@
 	model = "AVM FRITZ!Box 7360 V2";
 };
 
-&power_green {
-	label = "fritz7360-v2:green:power";
-};
-
-&power_red {
-	label = "fritz7360-v2:red:power";
-};
-
-&info_green {
-	label = "fritz7360-v2:green:info";
-};
-
-&wifi {
-	label = "fritz7360-v2:green:wlan";
-};
-
-&info_red {
-	label = "fritz7360-v2:red:info";
-};
-
-&dect {
-	label = "fritz7360-v2:green:dect";
-};
-
 &state_default {
 	pcie-rst {
 		lantiq,pins = "io21";
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
index 758a5b9814..898ca00c34 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7360sl.dts
@@ -7,30 +7,6 @@
 	model = "AVM FRITZ!Box 7360 SL";
 };
 
-&power_green {
-	label = "fritz7360sl:green:power";
-};
-
-&power_red {
-	label = "fritz7360sl:red:power";
-};
-
-&info_green {
-	label = "fritz7360sl:green:info";
-};
-
-&wifi {
-	label = "fritz7360sl:green:wlan";
-};
-
-&info_red {
-	label = "fritz7360sl:red:info";
-};
-
-&dect {
-	label = "fritz7360sl:green:dect";
-};
-
 &state_default {
 	pcie-rst {
 		lantiq,pins = "io38";
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
index 959cb80ef4..c26908642c 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7362sl.dts
@@ -7,30 +7,6 @@
 	model = "AVM FRITZ!Box 7362 SL";
 };
 
-&power_green {
-	label = "fritz7362sl:green:power";
-};
-
-&power_red {
-	label = "fritz7362sl:red:power";
-};
-
-&info_green {
-	label = "fritz7362sl:green:info";
-};
-
-&wifi {
-	label = "fritz7362sl:green:wlan";
-};
-
-&info_red {
-	label = "fritz7362sl:red:info";
-};
-
-&dect {
-	label = "fritz7362sl:green:dect";
-};
-
 &state_default {
 	pcie-rst {
 		lantiq,pins = "io21";
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
index bd89e59511..5c41d3c505 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi
@@ -13,13 +13,13 @@
 	};
 
 	aliases {
-		led-boot = &power_green;
-		led-failsafe = &power_red;
-		led-running = &power_green;
-		led-upgrade = &power_red;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_red;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_red;
 
-		led-dsl = &info_green;
-		led-wifi = &wifi;
+		led-dsl = &led_info_green;
+		led-wifi = &led_wifi;
 	};
 
 	memory at 0 {
@@ -47,28 +47,34 @@
 	leds: leds {
 		compatible = "gpio-leds";
 
-		power_green: power {
+		led_power_green: power_green {
+			label = "green:power";
 			gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
-		power_red: power2 {
+		led_power_red: power_red {
+			label = "red:power";
 			gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
 		};
 
-		info_green: info_green {
+		led_info_green: info_green {
+			label = "green:info";
 			gpios = <&gpio 47 GPIO_ACTIVE_LOW>;
 		};
 
-		wifi: wifi {
+		led_wifi: wifi {
+			label = "green:wlan";
 			gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
 		};
 
-		info_red: info_red {
+		info_red {
+			label = "red:info";
 			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 		};
 
-		dect: dect {
+		dect {
+			label = "green:dect";
 			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
index 2518cb8b12..eed30c2f0f 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_avm_fritz7412.dts
@@ -49,33 +49,33 @@
 		compatible = "gpio-leds";
 
 		power_green: power_green {
-			label = "fritz7412:green:power";
+			label = "green:power";
 			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		power_red: power_red {
-			label = "fritz7412:red:power";
+			label = "red:power";
 			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		fon {
-			label = "fritz7412:green:fon";
+			label = "green:fon";
 			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 		};
 
 		dect {
-			label = "fritz7412:green:dect";
+			label = "green:dect";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		wifi: wifi {
-			label = "fritz7412:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		info: info {
-			label = "fritz7412:green:info";
+			label = "green:info";
 			gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
index db4d02d167..51af5469fd 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_bt_homehub-v5a.dts
@@ -54,44 +54,44 @@
 
 		/* broadband-* is a single RGB led */
 		broadband-red {
-			label = "bthomehubv5a:red:broadband";
+			label = "red:broadband";
 			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 		broadband-green {
-			label = "bthomehubv5a:green:broadband";
+			label = "green:broadband";
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 		broadband_blue: broadband-blue {
-			label = "bthomehubv5a:blue:broadband";
+			label = "blue:broadband";
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 		};
 
 		/* wireless-* is a single RGB led */
 		wireless-red {
-			label = "bthomehubv5a:red:wireless";
+			label = "red:wireless";
 			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 		};
 		wireless-green {
-			label = "bthomehubv5a:green:wireless";
+			label = "green:wireless";
 			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 		};
 		wireless_blue: wireless-blue {
-			label = "bthomehubv5a:blue:wireless";
+			label = "blue:wireless";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 
 		/* power-* is a single RGB led */
 		power_red: power-red {
-			label = "bthomehubv5a:red:power";
+			label = "red:power";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power-green {
-			label = "bthomehubv5a:green:power";
+			label = "green:power";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		power_blue: power-blue {
-			label = "bthomehubv5a:blue:power";
+			label = "blue:power";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
index 971d7fd9f5..2802663051 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_buffalo_wbmr-300hpd.dts
@@ -73,13 +73,13 @@
 		compatible = "gpio-leds";
 
 		diag_r: diag_r {
-			label = "wbmr300:red:diag";
+			label = "red:diag";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 			default_state = "off";
 		};
 
 		wifi_g: wifi_g {
-			label = "wbmr300:green:wifi";
+			label = "green:wifi";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
@@ -89,52 +89,52 @@
 		};
 
 		router_y: router_y {
-			label = "wbmr300:yellow:router";
+			label = "yellow:router";
 			gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		wifi_y: wifi_y {
-			label = "wbmr300:yellow:wifi";
+			label = "yellow:wifi";
 			gpios = <&gpio 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan1: lan1 {
-			label = "wbmr300:green:lan1";
+			label = "green:lan1";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan: wan {
-			label = "wbmr300:green:wan";
+			label = "green:wan";
 			gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan3: lan3 {
-			label = "wbmr300:green:lan3";
+			label = "green:lan3";
 			gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan2: lan2 {
-			label = "wbmr300:green:lan2";
+			label = "green:lan2";
 			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet_g: internet_g {
-			label = "wbmr300:green:internet";
+			label = "green:internet";
 			gpios = <&gpio 34 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet_y: internet_y {
-			label = "wbmr300:yellow:internet";
+			label = "yellow:internet";
 			gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
 		};
 
 		router_g: router_g {
-			label = "wbmr300:green:router";
+			label = "green:router";
 			gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_g: power_g {
-			label = "wbmr300:green:power";
+			label = "green:power";
 			gpios = <&gpio 49 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
index 223ff7dcf6..ea7fddbe0f 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_lantiq_easy80920.dtsi
@@ -44,40 +44,40 @@
 		compatible = "gpio-leds";
 
 		power: power {
-			label = "easy80920:green:power";
+			label = "green:power";
 			gpios = <&stp 9 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 		warning {
-			label = "easy80920:green:warning";
+			label = "green:warning";
 			gpios = <&stp 22 GPIO_ACTIVE_HIGH>;
 		};
 		fxs1 {
-			label = "easy80920:green:fxs1";
+			label = "green:fxs1";
 			gpios = <&stp 21 GPIO_ACTIVE_HIGH>;
 		};
 		fxs2 {
-			label = "easy80920:green:fxs2";
+			label = "green:fxs2";
 			gpios = <&stp 20 GPIO_ACTIVE_HIGH>;
 		};
 		fxo {
-			label = "easy80920:green:fxo";
+			label = "green:fxo";
 			gpios = <&stp 19 GPIO_ACTIVE_HIGH>;
 		};
 		led_usb1: usb1 {
-			label = "easy80920:green:usb1";
+			label = "green:usb1";
 			gpios = <&stp 18 GPIO_ACTIVE_HIGH>;
 		};
 		led_usb2: usb2 {
-			label = "easy80920:green:usb2";
+			label = "green:usb2";
 			gpios = <&stp 15 GPIO_ACTIVE_HIGH>;
 		};
 		sd {
-			label = "easy80920:green:sd";
+			label = "green:sd";
 			gpios = <&stp 14 GPIO_ACTIVE_HIGH>;
 		};
 		wps {
-			label = "easy80920:green:wps";
+			label = "green:wps";
 			gpios = <&stp 12 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
index bd72fab630..9dc6d767a6 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_netgear_dm200.dts
@@ -55,29 +55,29 @@
 		compatible = "gpio-leds";
 
 		power_amber: power_amber {
-			label = "dm200:amber:power";
+			label = "amber:power";
 			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		};
 		power_green: power_green {
-			label = "dm200:green:power";
+			label = "green:power";
 			gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan_amber {
-			label = "dm200:amber:lan";
+			label = "amber:lan";
 			gpios = <&gpio 33 GPIO_ACTIVE_HIGH>;
 		};
 		lan_green {
-			label = "dm200:green:lan";
+			label = "green:lan";
 			gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
 		};
 
 		dsl_amber {
-			label = "dm200:amber:dsl";
+			label = "amber:dsl";
 			gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
 		};
 		dsl_green: dsl_green {
-			label = "dm200:green:dsl";
+			label = "green:dsl";
 			gpios = <&gpio 36 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
index faa9b979bd..f4a7b8d3c9 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw8980.dts
@@ -3,12 +3,12 @@
 / {
 	compatible = "tplink,tdw8980", "tplink,tdw89x0", "lantiq,xway", "lantiq,vr9";
 	model = "TP-LINK TD-W8980";
+};
 
-	gpio-leds {
-		wifi2 {
-			label = "tdw8980:green:wlan5ghz";
-			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
-		};
+&leds {
+	wifi2 {
+		label = "green:wlan5ghz";
+		gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
 	};
 };
 
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
index c4ccac8932..f10e3a8567 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_tdw89x0.dtsi
@@ -12,12 +12,12 @@
 
 	aliases {
 		/* the power led can't be controlled, use the wps led instead */
-		led-boot = &wps;
-		led-failsafe = &wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
 
-		led-dsl = &dsl;
-		led-internet = &internet;
-		led-wifi = &wifi;
+		led-dsl = &led_dsl;
+		led-internet = &led_internet;
+		led-wifi = &led_wifi;
 		led-usb = &led_usb0;
 		led-usb2 = &led_usb2;
 	};
@@ -50,39 +50,44 @@
 		};
 	};
 
-	gpio-leds {
+	leds: leds {
 		compatible = "gpio-leds";
+
 		/*
 			power is not controllable via gpio
 		*/
-		dsl: dsl {
-			label = "tdw89x0:green:dsl";
+
+		led_dsl: dsl {
+			label = "green:dsl";
 			gpios = <&gpio 4 GPIO_ACTIVE_HIGH>;
 		};
-		internet: internet {
-			label = "tdw89x0:green:internet";
+
+		led_internet: internet {
+			label = "green:internet";
 			gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_usb0: usb0 {
-			label = "tdw89x0:green:usb";
+			label = "green:usb";
 			gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
 		};
+
 		led_usb2: usb2 {
-			label = "tdw89x0:green:usb2";
+			label = "green:usb2";
 			gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
 		};
-		wps: wps {
-			label = "tdw89x0:green:wps";
+
+		led_wps: wps {
+			label = "green:wps";
 			gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
-	wifi-leds {
+	ath9k-leds {
 		compatible = "gpio-leds";
 
-		wifi: wifi {
-			label = "tdw89x0:green:wifi";
+		led_wifi: wifi {
+			label = "green:wifi";
 			gpios = <&ath9k 0 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "phy0tpt";
 		};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
index 15a342955a..4ad7a484e6 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dts
@@ -7,84 +7,19 @@
 	chosen {
 		bootargs = "console=ttyLTQ0,115200";
 	};
+};
 
-	aliases {
-		led-boot = &power;
-		led-failsafe = &power;
-		led-running = &power;
-		led-upgrade = &power;
-
-		led-dsl = &dsl;
-		led-internet = &internet;
-		led-wifi = &wlan5g;
-
-		led-usb = &led_usb;
-		led-usb2 = &led_usb;
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		poll-interval = <100>;
-		reset {
-			label = "reset";
-			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		wifi {
-			label = "wifi";
-			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-			linux,code = <KEY_RFKILL>;
-			linux,input-type = <EV_SW>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-
-		led {
-			label = "led";
-			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_LIGHTS_TOGGLE>;
-		};
+&keys {
+	led {
+		label = "led";
+		gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
+		linux,code = <KEY_LIGHTS_TOGGLE>;
 	};
+};
 
-	leds {
-		compatible = "gpio-leds";
-		power: power {
-			label = "vr200:blue:power";
-			gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
-			default-state = "keep";
-		};
-		dsl: dsl {
-			label = "vr200:blue:dsl";
-			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-		};
-		internet: internet {
-			label = "vr200:blue:internet";
-			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-		};
-		led_usb: usb {
-			label = "vr200:blue:usb";
-			gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
-		};
-		eth {
-			label = "vr200:blue:lan";
-			gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
-		};
-		wlan {
-			label = "vr200:blue:wlan";
-			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
-		};
-		wlan5g: wifi {
-			label = "vr200:blue:wlan5g";
-			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
-		};
-		led_wps {
-			label = "vr200:blue:wps";
-			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
-		};
+&leds {
+	wps {
+		label = "blue:wps";
+		gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 	};
 };
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
index 46b699a93e..19cfb822eb 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200.dtsi
@@ -4,11 +4,89 @@
 #include <dt-bindings/mips/lantiq_rcu_gphy.h>
 
 / {
+	aliases {
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+
+		led-dsl = &led_dsl;
+		led-internet = &led_internet;
+		led-wifi = &led_wlan5g;
+
+		led-usb = &led_usb;
+		led-usb2 = &led_usb;
+	};
+
 	memory at 0 {
 		device_type = "memory";
 		reg = <0x0 0x7f00000>;
 	};
 
+	keys: keys {
+		compatible = "gpio-keys-polled";
+		poll-interval = <100>;
+
+		reset {
+			label = "reset";
+			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+
+		wifi {
+			label = "wifi";
+			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+			linux,code = <KEY_RFKILL>;
+			linux,input-type = <EV_SW>;
+		};
+
+		wps {
+			label = "wps";
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WPS_BUTTON>;
+		};
+	};
+
+	leds: leds {
+		compatible = "gpio-leds";
+
+		led_power: power {
+			label = "blue:power";
+			gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
+			default-state = "keep";
+		};
+
+		led_dsl: dsl {
+			label = "blue:dsl";
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
+		};
+
+		led_internet: internet {
+			label = "blue:internet";
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
+		};
+
+		led_usb: usb {
+			label = "blue:usb";
+			gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
+		};
+
+		eth {
+			label = "blue:lan";
+			gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
+		};
+
+		wlan {
+			label = "blue:wlan";
+			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
+		};
+
+		led_wlan5g: wifi {
+			label = "blue:wlan5g";
+			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
+		};
+	};
+
 	usb_vbus: regulator-usb-vbus {
 		compatible = "regulator-fixed";
 
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts
index 10c95fa873..110e91a7b9 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_tplink_vr200v.dts
@@ -7,85 +7,20 @@
 	chosen {
 		bootargs = "console=ttyLTQ0,115200 mem=126M vpe1_load_addr=0x87e00000 vpe1_mem=2M maxvpes=1 maxtcs=1 nosmp";
 	};
+};
 
-	aliases {
-		led-boot = &power;
-		led-failsafe = &power;
-		led-running = &power;
-		led-upgrade = &power;
-
-		led-dsl = &dsl;
-		led-internet = &internet;
-		led-wifi = &wlan5g;
-
-		led-usb = &led_usb;
-		led-usb2 = &led_usb;
-	};
-
-	keys {
-		compatible = "gpio-keys-polled";
-		poll-interval = <100>;
-		reset {
-			label = "reset";
-			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		wifi {
-			label = "wifi";
-			gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-			linux,code = <KEY_RFKILL>;
-			linux,input-type = <EV_SW>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-
-		dect_paging {
-			label = "dect_paging";
-			gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_PHONE>;
-		};
+&keys {
+	dect_paging {
+		label = "dect_paging";
+		gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
+		linux,code = <KEY_PHONE>;
 	};
+};
 
-	leds {
-		compatible = "gpio-leds";
-		power: power {
-			label = "vr200v:blue:power";
-			gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
-			default-state = "keep";
-		};
-		dsl: dsl {
-			label = "vr200v:blue:dsl";
-			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-		};
-		internet: internet {
-			label = "vr200v:blue:internet";
-			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
-		};
-		led_usb: usb {
-			label = "vr200v:blue:usb";
-			gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
-		};
-		eth {
-			label = "vr200v:blue:lan";
-			gpios = <&gpio 40 GPIO_ACTIVE_LOW>;
-		};
-		wlan {
-			label = "vr200v:blue:wlan";
-			gpios = <&gpio 24 GPIO_ACTIVE_LOW>;
-		};
-		wlan5g: wifi {
-			label = "vr200v:blue:wlan5g";
-			gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
-		};
-		phone {
-			label = "vr200v:blue:phone";
-			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
-		};
+&leds {
+	phone {
+		label = "blue:phone";
+		gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 	};
 };
 
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
index 03a00c6930..2812df7e68 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-f1.dts
@@ -11,11 +11,11 @@
 
 	leds {
 		led_usb1: usb1 {
-			label = "p2812hnuf1:green:usb1";
+			label = "green:usb1";
 			gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
 		};
 		led_usb2: usb2 {
-			label = "p2812hnuf1:green:usb2";
+			label = "green:usb2";
 			gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
 		};
 	};
diff --git a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
index 6c30a91553..c4f30f5ffc 100644
--- a/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
+++ b/target/linux/lantiq/files-5.4/arch/mips/boot/dts/lantiq/vr9_zyxel_p-2812hnu-fx.dtsi
@@ -47,52 +47,52 @@
 		compatible = "gpio-leds";
 
 		internet_red {
-			label = "p2812hnufx:red:internet";
+			label = "red:internet";
 			gpios = <&stp 16 GPIO_ACTIVE_LOW>;
 		};
 		internet_green: internet_green {
-			label = "p2812hnufx:green:internet";
+			label = "green:internet";
 			gpios = <&stp 17 GPIO_ACTIVE_LOW>;
 		};
 		dsl_green: dsl_green {
-			label = "p2812hnufx:green:dsl";
+			label = "green:dsl";
 			gpios = <&stp 18 GPIO_ACTIVE_LOW>;
 		};
 		dsl_orange {
-			label = "p2812hnufx:orange:dsl";
+			label = "orange:dsl";
 			gpios = <&stp 19 GPIO_ACTIVE_LOW>;
 		};
 		wireless_orange {
-			label = "p2812hnufx:orange:wlan";
+			label = "orange:wlan";
 			gpios = <&stp 20 GPIO_ACTIVE_LOW>;
 		};
 		wireless_green: wireless_green {
-			label = "p2812hnufx:green:wlan";
+			label = "green:wlan";
 			gpios = <&stp 21 GPIO_ACTIVE_LOW>;
 		};
 		power_red: power {
-			label = "p2812hnufx:red:power";
+			label = "red:power";
 			gpios = <&stp 22 GPIO_ACTIVE_LOW>;
 		};
 		power_green: power2 {
-			label = "p2812hnufx:green:power";
+			label = "green:power";
 			gpios = <&stp 23 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 		phone1 {
-			label = "p2812hnufx:green:phone";
+			label = "green:phone";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 		};
 		phone1warn {
-			label = "p2812hnufx:orange:phone";
+			label = "orange:phone";
 			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 		phone2warn {
-			label = "p2812hnufx:orange:phone2";
+			label = "orange:phone2";
 			gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
 		};
 		phone2 {
-			label = "p2812hnufx:green:phone2";
+			label = "green:phone2";
 			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 	};
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
diff --git a/target/linux/lantiq/xway/base-files/etc/board.d/01_leds b/target/linux/lantiq/xway/base-files/etc/board.d/01_leds
index 82a39f4648..872634aa61 100755
--- a/target/linux/lantiq/xway/base-files/etc/board.d/01_leds
+++ b/target/linux/lantiq/xway/base-files/etc/board.d/01_leds
@@ -32,10 +32,10 @@ board=$(board_name)
 
 case "$board" in
 arcadyan,arv7506pw11)
-	ucidef_set_led_wlan "wifi" "wifi" "arv7506pw11:green:wlan" "phy0radio"
+	ucidef_set_led_wlan "wifi" "wifi" "green:wlan" "phy0radio"
 	;;
 arcadyan,arv752dpw22)
-	ucidef_set_led_wlan "wifi" "wifi" "arv752dpw22:red:wifi" "phy0radio"
+	ucidef_set_led_wlan "wifi" "wifi" "red:wifi" "phy0radio"
 	;;
 esac
 
diff --git a/target/linux/lantiq/xway/base-files/etc/uci-defaults/01_led_migration b/target/linux/lantiq/xway/base-files/etc/uci-defaults/01_led_migration
index 0139ef28b5..5769739b7e 100644
--- a/target/linux/lantiq/xway/base-files/etc/uci-defaults/01_led_migration
+++ b/target/linux/lantiq/xway/base-files/etc/uci-defaults/01_led_migration
@@ -27,10 +27,12 @@ bt,homehub-v3a)
 	;;
 netgear,dgn3500|\
 netgear,dgn3500b)
-	migrate_leds "dgn3500:blue:wireless=dgn3500:green:wireless"
+	migrate_leds "blue:wireless=green:wireless"
 	;;
 esac
 
+remove_devicename_leds
+
 migrations_apply system
 
 exit 0
diff --git a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds
index 4200dcb0c8..d82187de15 100755
--- a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds
+++ b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds
@@ -32,7 +32,7 @@ board=$(board_name)
 
 case "$board" in
 arcadyan,arv4525pw)
-	ucidef_set_led_netdev "wifi" "wifi" "arv4525pw:green:wlan" "wlan0"
+	ucidef_set_led_netdev "wifi" "wifi" "green:wlan" "wlan0"
 	;;
 esac
 
diff --git a/target/linux/lantiq/xway_legacy/base-files/etc/uci-defaults/01_led_migration b/target/linux/lantiq/xway_legacy/base-files/etc/uci-defaults/01_led_migration
index 18bf6a3f96..7011e06272 100644
--- a/target/linux/lantiq/xway_legacy/base-files/etc/uci-defaults/01_led_migration
+++ b/target/linux/lantiq/xway_legacy/base-files/etc/uci-defaults/01_led_migration
@@ -23,6 +23,8 @@ arcadyan,arv452cqw)
 	;;
 esac
 
+remove_devicename_leds
+
 migrations_apply system
 
 exit 0



More information about the lede-commits mailing list