Merge Official Source

config/Config-build.in

@@ -341,12 +341,15 @@ menu "Global build settings"
 	choice
 		prompt "default SELinux type"
 		depends on TARGET_ROOTFS_SECURITY_LABELS
-		default SELINUXTYPE_targeted
+		default SELINUXTYPE_dssp
 		help
 		  Choose SELinux policy to be used for build.
 		config SELINUXTYPE_targeted
 			bool "targeted"
 			select PACKAGE_refpolicy
+		config SELINUXTYPE_dssp
+			bool "dssp"
+			select PACKAGE_selinux-policy
 	endchoice
 
 endmenu

include/prereq-build.mk

@@ -26,6 +26,7 @@ $(eval $(call TestHostCommand,proper-umask, \
 	Please build with umask 022 - other values produce broken packages, \
 	umask | grep -xE 0?0[012][012]))
 
+ifndef IB
 $(eval $(call SetupHostCommand,gcc, \
 	Please install the GNU C Compiler (gcc) 4.8 or later, \
 	$(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \
@@ -37,7 +38,9 @@ $(eval $(call TestHostCommand,working-gcc, \
 	it appears to be broken, \
 	echo 'int main(int argc, char **argv) { return 0; }' | \
 		gcc -x c -o $(TMP_DIR)/a.out -))
+endif
 
+ifndef IB
 $(eval $(call SetupHostCommand,g++, \
 	Please install the GNU C++ Compiler (g++) 4.8 or later, \
 	$(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \
@@ -50,6 +53,7 @@ $(eval $(call TestHostCommand,working-g++, \
 	echo 'int main(int argc, char **argv) { return 0; }' | \
 		g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \
 		$(TMP_DIR)/a.out))
+endif
 
 ifndef IB
 $(eval $(call TestHostCommand,ncurses, \

package/firmware/ipq-wifi/Makefile

@@ -31,7 +31,6 @@ ALLWIFIBOARDS:= \
 	buffalo_wtr-m2133hp \
 	cellc_rtl30vw \
 	dlink_dap2610 \
-	edgecore_ecw5211 \
 	edgecore_ecw5410 \
 	edgecore_oap100 \
 	engenius_eap2200 \
@@ -111,7 +110,6 @@ $(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-1200,AVM FRITZRepeater
 $(eval $(call generate-ipq-wifi-package,buffalo_wtr-m2133hp,Buffalo WTR-M2133HP))
 $(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW))
 $(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610))
-$(eval $(call generate-ipq-wifi-package,edgecore_ecw5211,Edgecore ECW5211))
 $(eval $(call generate-ipq-wifi-package,edgecore_ecw5410,Edgecore ECW5410))
 $(eval $(call generate-ipq-wifi-package,edgecore_oap100,Edgecore OAP100))
 $(eval $(call generate-ipq-wifi-package,engenius_eap2200,EnGenius EAP2200))

package/kernel/mac80211/patches/rt2x00/990-rt2x00-mt7620-introduce-accessors-for-CHIP_VER-register.patch

@@ -0,0 +1,139 @@
+--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
++++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
+@@ -78,6 +78,9 @@ struct rt2800_ops {
+ 	int (*drv_init_registers)(struct rt2x00_dev *rt2x00dev);
+ 	__le32 *(*drv_get_txwi)(struct queue_entry *entry);
+ 	unsigned int (*drv_get_dma_done)(struct data_queue *queue);
++	int (*hw_get_chippkg)(void);
++	int (*hw_get_chipver)(void);
++	int (*hw_get_chipeco)(void);
+ };
+ 
+ static inline u32 rt2800_register_read(struct rt2x00_dev *rt2x00dev,
+@@ -195,6 +198,27 @@ static inline unsigned int rt2800_drv_ge
+ 	return rt2800ops->drv_get_dma_done(queue);
+ }
+ 
++static inline int rt2800_hw_get_chippkg(struct rt2x00_dev *rt2x00dev)
++{
++	const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
++
++	return rt2800ops->hw_get_chippkg();
++}
++
++static inline int rt2800_hw_get_chipver(struct rt2x00_dev *rt2x00dev)
++{
++	const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
++
++	return rt2800ops->hw_get_chipver();
++}
++
++static inline int rt2800_hw_get_chipeco(struct rt2x00_dev *rt2x00dev)
++{
++	const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
++
++	return rt2800ops->hw_get_chipeco();
++}
++
+ void rt2800_mcu_request(struct rt2x00_dev *rt2x00dev,
+ 			const u8 command, const u8 token,
+ 			const u8 arg0, const u8 arg1);
+--- a/drivers/net/wireless/ralink/rt2x00/rt2800pci.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt2800pci.c
+@@ -286,6 +286,10 @@ static int rt2800pci_read_eeprom(struct
+ 	return retval;
+ }
+ 
++static int rt2800pci_get_chippkg(void) { return 0; }
++static int rt2800pci_get_chipver(void) { return 0; }
++static int rt2800pci_get_chipeco(void) { return 0; }
++
+ static const struct ieee80211_ops rt2800pci_mac80211_ops = {
+ 	.tx			= rt2x00mac_tx,
+ 	.start			= rt2x00mac_start,
+@@ -328,6 +332,9 @@ static const struct rt2800_ops rt2800pci
+ 	.drv_init_registers	= rt2800mmio_init_registers,
+ 	.drv_get_txwi		= rt2800mmio_get_txwi,
+ 	.drv_get_dma_done	= rt2800mmio_get_dma_done,
++	.hw_get_chippkg		= rt2800pci_get_chippkg,
++	.hw_get_chipver		= rt2800pci_get_chipver,
++	.hw_get_chipeco		= rt2800pci_get_chipeco,
+ };
+ 
+ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
+--- a/drivers/net/wireless/ralink/rt2x00/rt2800soc.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt2800soc.c
+@@ -27,6 +27,12 @@
+ #include "rt2800lib.h"
+ #include "rt2800mmio.h"
+ 
++/* Needed to probe CHIP_VER register on MT7620 */
++#ifdef CONFIG_SOC_MT7620
++#include <asm/mach-ralink/ralink_regs.h>
++#include <asm/mach-ralink/mt7620.h>
++#endif
++
+ /* Allow hardware encryption to be disabled. */
+ static bool modparam_nohwcrypt;
+ module_param_named(nohwcrypt, modparam_nohwcrypt, bool, 0444);
+@@ -118,6 +124,27 @@ static int rt2800soc_write_firmware(stru
+ 	return 0;
+ }
+ 
++#ifdef CONFIG_SOC_MT7620
++static int rt2800soc_get_chippkg(void)
++{
++	return mt7620_get_pkg();
++}
++
++static int rt2800soc_get_chipver(void)
++{
++	return mt7620_get_chipver();
++}
++
++static int rt2800soc_get_chipeco(void)
++{
++	return mt7620_get_eco();
++}
++#else
++static int rt2800soc_get_chippkg(void) { return 0; }
++static int rt2800soc_get_chipver(void) { return 0; }
++static int rt2800soc_get_chipeco(void) { return 0; }
++#endif
++
+ static const struct ieee80211_ops rt2800soc_mac80211_ops = {
+ 	.tx			= rt2x00mac_tx,
+ 	.start			= rt2x00mac_start,
+@@ -159,6 +186,9 @@ static const struct rt2800_ops rt2800soc
+ 	.drv_init_registers	= rt2800mmio_init_registers,
+ 	.drv_get_txwi		= rt2800mmio_get_txwi,
+ 	.drv_get_dma_done	= rt2800mmio_get_dma_done,
++	.hw_get_chippkg		= rt2800soc_get_chippkg,
++	.hw_get_chipver		= rt2800soc_get_chipver,
++	.hw_get_chipeco		= rt2800soc_get_chipeco,
+ };
+ 
+ static const struct rt2x00lib_ops rt2800soc_rt2x00_ops = {
+--- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
+@@ -628,6 +628,10 @@ static int rt2800usb_probe_hw(struct rt2
+ 	return 0;
+ }
+ 
++static int rt2800usb_get_chippkg(void) { return 0; }
++static int rt2800usb_get_chipver(void) { return 0; }
++static int rt2800usb_get_chipeco(void) { return 0; }
++
+ static const struct ieee80211_ops rt2800usb_mac80211_ops = {
+ 	.tx			= rt2x00mac_tx,
+ 	.start			= rt2x00mac_start,
+@@ -671,6 +675,9 @@ static const struct rt2800_ops rt2800usb
+ 	.drv_init_registers	= rt2800usb_init_registers,
+ 	.drv_get_txwi		= rt2800usb_get_txwi,
+ 	.drv_get_dma_done	= rt2800usb_get_dma_done,
++	.hw_get_chippkg		= rt2800usb_get_chippkg,
++	.hw_get_chipver		= rt2800usb_get_chipver,
++	.hw_get_chipeco		= rt2800usb_get_chipeco,
+ };
+ 
+ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {

package/kernel/mac80211/patches/rt2x00/991-rt2x00-mt7620-differentiate-based-on-SoC-CHIP_VER.patch

@@ -0,0 +1,408 @@
+--- a/drivers/net/wireless/ralink/rt2x00/rt2800.h
++++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h
+@@ -1042,6 +1042,11 @@
+ #define MIMO_PS_CFG_RX_STBY_POL		FIELD32(0x00000010)
+ #define MIMO_PS_CFG_RX_RX_STBY0		FIELD32(0x00000020)
+ 
++#define BB_PA_MODE_CFG0			0x1214
++#define BB_PA_MODE_CFG1			0x1218
++#define RF_PA_MODE_CFG0			0x121C
++#define RF_PA_MODE_CFG1			0x1220
++
+ /*
+  * EDCA_AC0_CFG:
+  */
+--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
++++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+@@ -3685,14 +3685,16 @@ static void rt2800_config_channel_rf7620
+ 	rt2x00_set_field8(&rfcsr, RFCSR19_K, rf->rf4);
+ 	rt2800_rfcsr_write(rt2x00dev, 19, rfcsr);
+ 
+-	/* Default: XO=20MHz , SDM mode */
+-	rfcsr = rt2800_rfcsr_read(rt2x00dev, 16);
+-	rt2x00_set_field8(&rfcsr, RFCSR16_SDM_MODE_MT7620, 0x80);
+-	rt2800_rfcsr_write(rt2x00dev, 16, rfcsr);
+-
+-	rfcsr = rt2800_rfcsr_read(rt2x00dev, 21);
+-	rt2x00_set_field8(&rfcsr, RFCSR21_BIT8, 1);
+-	rt2800_rfcsr_write(rt2x00dev, 21, rfcsr);
++	if (rt2800_hw_get_chipver(rt2x00dev) > 1) {
++		/* Default: XO=20MHz , SDM mode */
++		rfcsr = rt2800_rfcsr_read(rt2x00dev, 16);
++		rt2x00_set_field8(&rfcsr, RFCSR16_SDM_MODE_MT7620, 0x80);
++		rt2800_rfcsr_write(rt2x00dev, 16, rfcsr);
++
++		rfcsr = rt2800_rfcsr_read(rt2x00dev, 21);
++		rt2x00_set_field8(&rfcsr, RFCSR21_BIT8, 1);
++		rt2800_rfcsr_write(rt2x00dev, 21, rfcsr);
++	}
+ 
+ 	rfcsr = rt2800_rfcsr_read(rt2x00dev, 1);
+ 	rt2x00_set_field8(&rfcsr, RFCSR1_TX2_EN_MT7620,
+@@ -3726,18 +3728,23 @@ static void rt2800_config_channel_rf7620
+ 		rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x20);
+ 	}
+ 
+-	if (conf_is_ht40(conf)) {
+-		rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x08);
+-		rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x08);
+-	} else {
+-		rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x28);
+-		rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x28);
++	if (rt2800_hw_get_chipver(rt2x00dev) > 1) {
++		if (conf_is_ht40(conf)) {
++			rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x08);
++			rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x08);
++		} else {
++			rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x28);
++			rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x28);
++		}
+ 	}
+ 
+-	rfcsr = rt2800_rfcsr_read(rt2x00dev, 28);
+-	rt2x00_set_field8(&rfcsr, RFCSR28_CH11_HT40,
+-			  conf_is_ht40(conf) && (rf->channel == 11));
+-	rt2800_rfcsr_write(rt2x00dev, 28, rfcsr);
++	if (rt2800_hw_get_chipver(rt2x00dev) > 1 &&
++	    rt2800_hw_get_chipeco(rt2x00dev) == 2) {
++		rfcsr = rt2800_rfcsr_read(rt2x00dev, 28);
++		rt2x00_set_field8(&rfcsr, RFCSR28_CH11_HT40,
++				  conf_is_ht40(conf) && (rf->channel == 11));
++		rt2800_rfcsr_write(rt2x00dev, 28, rfcsr);
++	}
+ 
+ 	if (!test_bit(DEVICE_STATE_SCANNING, &rt2x00dev->flags)) {
+ 		if (conf_is_ht40(conf)) {
+@@ -3837,25 +3844,29 @@ static void rt2800_config_alc(struct rt2
+ 	if (i == 10000)
+ 		rt2x00_warn(rt2x00dev, "Wait MAC Status to MAX !!!\n");
+ 
+-	if (chan->center_freq > 2457) {
+-		bbp = rt2800_bbp_read(rt2x00dev, 30);
+-		bbp = 0x40;
+-		rt2800_bbp_write(rt2x00dev, 30, bbp);
+-		rt2800_rfcsr_write(rt2x00dev, 39, 0);
+-		if (rt2x00_has_cap_external_lna_bg(rt2x00dev))
+-			rt2800_rfcsr_write(rt2x00dev, 42, 0xfb);
+-		else
+-			rt2800_rfcsr_write(rt2x00dev, 42, 0x7b);
+-	} else {
+-		bbp = rt2800_bbp_read(rt2x00dev, 30);
+-		bbp = 0x1f;
+-		rt2800_bbp_write(rt2x00dev, 30, bbp);
+-		rt2800_rfcsr_write(rt2x00dev, 39, 0x80);
+-		if (rt2x00_has_cap_external_lna_bg(rt2x00dev))
+-			rt2800_rfcsr_write(rt2x00dev, 42, 0xdb);
+-		else
+-			rt2800_rfcsr_write(rt2x00dev, 42, 0x5b);
++	if (rt2800_hw_get_chipver(rt2x00dev) > 1 &&
++	    rt2800_hw_get_chipeco(rt2x00dev) >= 2) {
++		if (chan->center_freq > 2457) {
++			bbp = rt2800_bbp_read(rt2x00dev, 30);
++			bbp = 0x40;
++			rt2800_bbp_write(rt2x00dev, 30, bbp);
++			rt2800_rfcsr_write(rt2x00dev, 39, 0);
++			if (rt2x00_has_cap_external_lna_bg(rt2x00dev))
++				rt2800_rfcsr_write(rt2x00dev, 42, 0xfb);
++			else
++				rt2800_rfcsr_write(rt2x00dev, 42, 0x7b);
++		} else {
++			bbp = rt2800_bbp_read(rt2x00dev, 30);
++			bbp = 0x1f;
++			rt2800_bbp_write(rt2x00dev, 30, bbp);
++			rt2800_rfcsr_write(rt2x00dev, 39, 0x80);
++			if (rt2x00_has_cap_external_lna_bg(rt2x00dev))
++				rt2800_rfcsr_write(rt2x00dev, 42, 0xdb);
++			else
++				rt2800_rfcsr_write(rt2x00dev, 42, 0x5b);
++		}
+ 	}
++
+ 	rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, mac_sys_ctrl);
+ 
+ 	rt2800_vco_calibration(rt2x00dev);
+@@ -5887,18 +5898,33 @@ static int rt2800_init_registers(struct
+ 	} else if (rt2x00_rt(rt2x00dev, RT5350)) {
+ 		rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
+ 	} else if (rt2x00_rt(rt2x00dev, RT6352)) {
+-		rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000401);
+-		rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x000C0000);
+-		rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
+-		rt2800_register_write(rt2x00dev, TX_ALC_VGA3, 0x00000000);
+-		rt2800_register_write(rt2x00dev, TX0_BB_GAIN_ATTEN, 0x0);
+-		rt2800_register_write(rt2x00dev, TX1_BB_GAIN_ATTEN, 0x0);
+-		rt2800_register_write(rt2x00dev, TX0_RF_GAIN_ATTEN, 0x6C6C666C);
+-		rt2800_register_write(rt2x00dev, TX1_RF_GAIN_ATTEN, 0x6C6C666C);
+-		rt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT,
+-				      0x3630363A);
+-		rt2800_register_write(rt2x00dev, TX1_RF_GAIN_CORRECT,
+-				      0x3630363A);
++		if (rt2800_hw_get_chipver(rt2x00dev) <= 1) {
++			rt2800_register_write(rt2x00dev, TX_ALC_VGA3,
++					      0x00000000);
++			rt2800_register_write(rt2x00dev, BB_PA_MODE_CFG0,
++					      0x000055FF);
++			rt2800_register_write(rt2x00dev, BB_PA_MODE_CFG1,
++					      0x00550055);
++			rt2800_register_write(rt2x00dev, RF_PA_MODE_CFG0,
++					      0x000055FF);
++			rt2800_register_write(rt2x00dev, RF_PA_MODE_CFG1,
++					      0x00550055);
++		} else {
++			rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000401);
++			rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x000C0000);
++			rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
++			rt2800_register_write(rt2x00dev, TX_ALC_VGA3, 0x00000000);
++			rt2800_register_write(rt2x00dev, TX0_BB_GAIN_ATTEN, 0x0);
++			rt2800_register_write(rt2x00dev, TX1_BB_GAIN_ATTEN, 0x0);
++			rt2800_register_write(rt2x00dev, TX0_RF_GAIN_ATTEN,
++					      0x6C6C666C);
++			rt2800_register_write(rt2x00dev, TX1_RF_GAIN_ATTEN,
++					      0x6C6C666C);
++			rt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT,
++					      0x3630363A);
++			rt2800_register_write(rt2x00dev, TX1_RF_GAIN_CORRECT,
++					      0x3630363A);
++		}
+ 		reg = rt2800_register_read(rt2x00dev, TX_ALC_CFG_1);
+ 		rt2x00_set_field32(&reg, TX_ALC_CFG_1_ROS_BUSY_EN, 0);
+ 		rt2800_register_write(rt2x00dev, TX_ALC_CFG_1, reg);
+@@ -7042,14 +7068,16 @@ static void rt2800_init_bbp_6352(struct
+ 	rt2800_bbp_write(rt2x00dev, 188, 0x00);
+ 	rt2800_bbp_write(rt2x00dev, 189, 0x00);
+ 
+-	rt2800_bbp_write(rt2x00dev, 91, 0x06);
+-	rt2800_bbp_write(rt2x00dev, 92, 0x04);
+-	rt2800_bbp_write(rt2x00dev, 93, 0x54);
+-	rt2800_bbp_write(rt2x00dev, 99, 0x50);
+-	rt2800_bbp_write(rt2x00dev, 148, 0x84);
+-	rt2800_bbp_write(rt2x00dev, 167, 0x80);
+-	rt2800_bbp_write(rt2x00dev, 178, 0xFF);
+-	rt2800_bbp_write(rt2x00dev, 106, 0x13);
++	if (rt2800_hw_get_chipver(rt2x00dev) > 1) {
++		rt2800_bbp_write(rt2x00dev, 91, 0x06);
++		rt2800_bbp_write(rt2x00dev, 92, 0x04);
++		rt2800_bbp_write(rt2x00dev, 93, 0x54);
++		rt2800_bbp_write(rt2x00dev, 99, 0x50);
++		rt2800_bbp_write(rt2x00dev, 148, 0x84);
++		rt2800_bbp_write(rt2x00dev, 167, 0x80);
++		rt2800_bbp_write(rt2x00dev, 178, 0xFF);
++		rt2800_bbp_write(rt2x00dev, 106, 0x13);
++	}
+ 
+ 	/* BBP for G band GLRT function (BBP_128 ~ BBP_221) */
+ 	rt2800_bbp_glrt_write(rt2x00dev, 0, 0x00);
+@@ -10388,31 +10416,36 @@ static void rt2800_init_rfcsr_6352(struc
+ 	rt2800_rfcsr_write(rt2x00dev, 42, 0x5B);
+ 	rt2800_rfcsr_write(rt2x00dev, 43, 0x00);
+ 
+-	rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
+-	if (rt2800_clk_is_20mhz(rt2x00dev))
+-		rt2800_rfcsr_write(rt2x00dev, 13, 0x03);
+-	else
+-		rt2800_rfcsr_write(rt2x00dev, 13, 0x00);
+-	rt2800_rfcsr_write(rt2x00dev, 14, 0x7C);
+-	rt2800_rfcsr_write(rt2x00dev, 16, 0x80);
+-	rt2800_rfcsr_write(rt2x00dev, 17, 0x99);
+-	rt2800_rfcsr_write(rt2x00dev, 18, 0x99);
+-	rt2800_rfcsr_write(rt2x00dev, 19, 0x09);
+-	rt2800_rfcsr_write(rt2x00dev, 20, 0x50);
+-	rt2800_rfcsr_write(rt2x00dev, 21, 0xB0);
+-	rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
+-	rt2800_rfcsr_write(rt2x00dev, 23, 0x06);
+-	rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
+-	rt2800_rfcsr_write(rt2x00dev, 25, 0x00);
+-	rt2800_rfcsr_write(rt2x00dev, 26, 0x5D);
+-	rt2800_rfcsr_write(rt2x00dev, 27, 0x00);
+-	rt2800_rfcsr_write(rt2x00dev, 28, 0x61);
+-	rt2800_rfcsr_write(rt2x00dev, 29, 0xB5);
+-	rt2800_rfcsr_write(rt2x00dev, 43, 0x02);
+-
+-	rt2800_rfcsr_write(rt2x00dev, 28, 0x62);
+-	rt2800_rfcsr_write(rt2x00dev, 29, 0xAD);
+-	rt2800_rfcsr_write(rt2x00dev, 39, 0x80);
++	if (rt2800_hw_get_chipver(rt2x00dev) > 1) {
++		rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
++		if (rt2800_clk_is_20mhz(rt2x00dev))
++			rt2800_rfcsr_write(rt2x00dev, 13, 0x03);
++		else
++			rt2800_rfcsr_write(rt2x00dev, 13, 0x00);
++		rt2800_rfcsr_write(rt2x00dev, 14, 0x7C);
++		rt2800_rfcsr_write(rt2x00dev, 16, 0x80);
++		rt2800_rfcsr_write(rt2x00dev, 17, 0x99);
++		rt2800_rfcsr_write(rt2x00dev, 18, 0x99);
++		rt2800_rfcsr_write(rt2x00dev, 19, 0x09);
++		rt2800_rfcsr_write(rt2x00dev, 20, 0x50);
++		rt2800_rfcsr_write(rt2x00dev, 21, 0xB0);
++		rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
++		rt2800_rfcsr_write(rt2x00dev, 23, 0x06);
++		rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
++		rt2800_rfcsr_write(rt2x00dev, 25, 0x00);
++		rt2800_rfcsr_write(rt2x00dev, 26, 0x5D);
++		rt2800_rfcsr_write(rt2x00dev, 27, 0x00);
++		rt2800_rfcsr_write(rt2x00dev, 28, 0x61);
++		rt2800_rfcsr_write(rt2x00dev, 29, 0xB5);
++		rt2800_rfcsr_write(rt2x00dev, 43, 0x02);
++	}
++
++	if (rt2800_hw_get_chipver(rt2x00dev) > 1 &&
++	    rt2800_hw_get_chipeco(rt2x00dev) >= 2) {
++		rt2800_rfcsr_write(rt2x00dev, 28, 0x62);
++		rt2800_rfcsr_write(rt2x00dev, 29, 0xAD);
++		rt2800_rfcsr_write(rt2x00dev, 39, 0x80);
++	}
+ 
+ 	/* Initialize RF channel register to default value */
+ 	rt2800_rfcsr_write_chanreg(rt2x00dev, 0, 0x03);
+@@ -10478,63 +10511,71 @@ static void rt2800_init_rfcsr_6352(struc
+ 
+ 	rt2800_rfcsr_write_bank(rt2x00dev, 6, 45, 0xC5);
+ 
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x47);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x71);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x33);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x0E);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 17, 0x23);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA4);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 20, 0x02);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 21, 0x12);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x1C);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 29, 0xEB);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 32, 0x7D);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 34, 0xD6);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 36, 0x08);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 38, 0xB4);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xD3);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xB3);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xD5);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27);
+-	rt2800_rfcsr_write_bank(rt2x00dev, 4, 47, 0x67);
+-	rt2800_rfcsr_write_bank(rt2x00dev, 6, 47, 0x69);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xFF);
+-	rt2800_rfcsr_write_bank(rt2x00dev, 4, 54, 0x27);
+-	rt2800_rfcsr_write_bank(rt2x00dev, 6, 54, 0x20);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xFF);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x1C);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x20);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6B);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xF7);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x09);
+-
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x51);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x06);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA7);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x2C);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x64);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 8, 0x51);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x36);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x53);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x16);
+-
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x6C);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xFC);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x1F);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x27);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6B);
+-
+-	/* Initialize RF channel register for DRQFN */
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xD3);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xE3);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xE5);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x28);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x68);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xF7);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x02);
+-	rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xC7);
++	if (rt2800_hw_get_chipver(rt2x00dev) > 1) {
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x47);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x71);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x33);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x0E);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 17, 0x23);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA4);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 20, 0x02);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 21, 0x12);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x1C);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 29, 0xEB);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 32, 0x7D);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 34, 0xD6);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 36, 0x08);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 38, 0xB4);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xD3);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xB3);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xD5);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27);
++		rt2800_rfcsr_write_bank(rt2x00dev, 4, 47, 0x67);
++		rt2800_rfcsr_write_bank(rt2x00dev, 6, 47, 0x69);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xFF);
++		rt2800_rfcsr_write_bank(rt2x00dev, 4, 54, 0x27);
++		rt2800_rfcsr_write_bank(rt2x00dev, 6, 54, 0x20);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xFF);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x1C);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x20);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6B);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xF7);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x09);
++	}
++
++	if (rt2800_hw_get_chipver(rt2x00dev) > 1 &&
++	    rt2800_hw_get_chipeco(rt2x00dev) >= 2) {
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x51);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x06);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA7);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x2C);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x64);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 8, 0x51);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x36);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x53);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x16);
++
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x6C);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xFC);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x1F);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x27);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6B);
++	}
++
++	if (rt2800_hw_get_chippkg(rt2x00dev) == 0 &&
++	    rt2800_hw_get_chipver(rt2x00dev) == 1) {
++		/* Initialize RF channel register for DRQFN */
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xD3);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xE3);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xE5);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x28);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x68);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xF7);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x02);
++		rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xC7);
++	}
+ 
+ 	/* Initialize RF DC calibration register to default value */
+ 	rt2800_rfcsr_write_dccal(rt2x00dev, 0, 0x47);
+@@ -10597,12 +10638,17 @@ static void rt2800_init_rfcsr_6352(struc
+ 	rt2800_rfcsr_write_dccal(rt2x00dev, 62, 0x00);
+ 	rt2800_rfcsr_write_dccal(rt2x00dev, 63, 0x00);
+ 
+-	rt2800_rfcsr_write_dccal(rt2x00dev, 3, 0x08);
+-	rt2800_rfcsr_write_dccal(rt2x00dev, 4, 0x04);
+-	rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x20);
++	if (rt2800_hw_get_chipver(rt2x00dev) > 1) {
++		rt2800_rfcsr_write_dccal(rt2x00dev, 3, 0x08);
++		rt2800_rfcsr_write_dccal(rt2x00dev, 4, 0x04);
++		rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x20);
++	}
+ 
+-	rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);
+-	rt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x7C);
++	if (rt2800_hw_get_chipver(rt2x00dev) > 1 &&
++	    rt2800_hw_get_chipeco(rt2x00dev) >= 2) {
++		rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);
++		rt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x7C);
++	}
+ 
+ 	rt2800_r_calibration(rt2x00dev);
+ 	rt2800_rf_self_txdc_cal(rt2x00dev);

package/system/selinux-policy/Makefile

@@ -0,0 +1,53 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=selinux-policy
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://git.defensec.nl/selinux-policy.git
+PKG_SOURCE_DATE:=2020-10-08
+PKG_SOURCE_VERSION:=cdedea73ecbb8968f9736c35c143b586c8371467
+PKG_MIRROR_HASH:=3d5a6d60b496b51ae272f7cb495a409c724ee193792f78652a2040b57fab56fe
+PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host
+
+PKG_MAINTAINER:=Dominick Grift <dominick.grift@defensec.nl>
+PKG_CPE_ID:=cpe:/a:defensec:selinux-policy
+PKG_LICENSE:=Unlicense
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/selinux-policy
+	SECTION:=system
+	CATEGORY:=Base system
+	TITLE:=SELinux security policy for OpenWrt
+	URL:=https://git.defensec.nl/?p=selinux-policy.git;a=summary
+	PKGARCH:=all
+endef
+
+define Package/selinux-policy/description
+	Basic SELinux Security Policy designed specifically for
+	OpenWrt and written in Common Intermediate Language.
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default,policy)
+endef
+
+define Package/selinux-policy/conffiles
+/etc/selinux/config
+endef
+
+define Package/selinux-policy/install
+	$(INSTALL_DIR) $(1)/etc/selinux/$(PKG_NAME)/contexts/files/
+	$(INSTALL_DIR) $(1)/etc/selinux/$(PKG_NAME)/policy/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/file_contexts.subs_dist $(1)/etc/selinux/$(PKG_NAME)/contexts/files/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/file_contexts $(1)/etc/selinux/$(PKG_NAME)/contexts/files/
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/policy.* $(1)/etc/selinux/$(PKG_NAME)/policy/
+	$(INSTALL_DATA) ./files/selinux-config $(1)/etc/selinux/config
+endef
+
+$(eval $(call BuildPackage,selinux-policy))

package/system/selinux-policy/files/selinux-config

@@ -0,0 +1,2 @@
+SELINUX=enforcing
+SELINUXTYPE=selinux-policy

package/utils/secilc/Makefile

@@ -0,0 +1,65 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=secilc
+PKG_VERSION:=3.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/20200710
+PKG_HASH:=86117246fec3017af710a9ff7c1dae3ed1cd571e232a86cff3e2a3de2d6aa65c
+HOST_BUILD_DEPENDS:=libsepol/host
+
+PKG_MAINTAINER:=Dominick Grift <dominick.grift@defensec.nl>
+PKG_CPE_ID:=cpe:/a:selinuxproject:secilc
+PKG_LICENSE:=BSD-2-Clause
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/nls.mk
+include $(INCLUDE_DIR)/package.mk
+
+HOST_LDFLAGS+=-Wl,-rpath=$(STAGING_DIR_HOSTPKG)/lib
+HOST_MAKE_FLAGS += \
+	DESTDIR=$(STAGING_DIR_HOSTPKG) \
+	PREFIX=
+
+define Package/secilc
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=SELinux Common Intermediate Language (CIL) Compiler
+	URL:=http://selinuxproject.org/page/Main_Page
+endef
+
+define Package/secilc/description
+	The SELinux CIL Compiler is a compiler that converts the CIL language as
+	described on the CIL design wiki into a kernel binary policy file.
+	Please see the CIL Design Wiki at:
+	http://github.com/SELinuxProject/cil/wiki/
+	for more information about the goals and features on the CIL language.
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default,secilc)
+endef
+
+define Host/Compile
+	$(call Host/Compile/Default,secilc)
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/secilc $(STAGING_DIR_HOSTPKG)/bin
+endef
+
+define Package/secilc/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/secilc $(1)/usr/bin
+endef
+
+$(eval $(call BuildPackage,secilc))
+$(eval $(call HostBuild))

target/linux/apm821xx/sata/config-default

@@ -18,7 +18,6 @@ CONFIG_EXT4_FS=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
 # CONFIG_F2FS_FS_SECURITY is not set
-CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_STAT_FS=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y

target/linux/armvirt/config-5.4

@@ -71,7 +71,6 @@ CONFIG_EXT4_FS=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
 # CONFIG_F2FS_FS_SECURITY is not set
-CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_STAT_FS=y
 CONFIG_FAILOVER=y
 CONFIG_FIX_EARLYCON_MEM=y

target/linux/bcm27xx/bcm2708/config-5.4

@@ -159,7 +159,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_STAT_FS=y
 CONFIG_FB=y
 CONFIG_FB_BCM2708=y

target/linux/bcm27xx/bcm2709/config-5.4

@@ -205,7 +205,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_STAT_FS=y
 CONFIG_FB=y
 CONFIG_FB_BCM2708=y

target/linux/bcm27xx/bcm2710/config-5.4

@@ -248,7 +248,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_STAT_FS=y
 CONFIG_FB=y
 CONFIG_FB_BCM2708=y

target/linux/bcm27xx/bcm2711/config-5.4

@@ -253,7 +253,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_STAT_FS=y
 CONFIG_FB=y
 CONFIG_FB_BCM2708=y

target/linux/generic/config-5.4

@@ -297,6 +297,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_CRYPTO is not set
 # CONFIG_ARM64_ERRATUM_1024718 is not set
 # CONFIG_ARM64_ERRATUM_1463225 is not set
+# CONFIG_ARM64_ERRATUM_1542419 is not set
 # CONFIG_ARM64_ERRATUM_819472 is not set
 # CONFIG_ARM64_ERRATUM_824069 is not set
 # CONFIG_ARM64_ERRATUM_826319 is not set
@@ -306,7 +307,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 # CONFIG_ARM64_ERRATUM_843419 is not set
 # CONFIG_ARM64_ERRATUM_845719 is not set
 # CONFIG_ARM64_ERRATUM_858921 is not set
-# CONFIG_ARM64_ERRATUM_1542419 is not set
 # CONFIG_ARM64_HW_AFDBM is not set
 # CONFIG_ARM64_LSE_ATOMICS is not set
 # CONFIG_ARM64_MODULE_PLTS is not set
@@ -836,7 +836,7 @@ CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
+CONFIG_CIFS_XATTR=y
 # CONFIG_CIO_DAC is not set
 CONFIG_CLANG_VERSION=0
 # CONFIG_CLEANCACHE is not set
@@ -1376,8 +1376,8 @@ CONFIG_DQL=y
 # CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
+# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 # CONFIG_DRM_PANFROST is not set
@@ -1485,12 +1485,13 @@ CONFIG_EPOLL=y
 CONFIG_ETHERNET=y
 # CONFIG_ETHOC is not set
 CONFIG_EVENTFD=y
+# CONFIG_EVM is not set
 # CONFIG_EXFAT_FS is not set
 CONFIG_EXPERT=y
 CONFIG_EXPORTFS=y
 # CONFIG_EXPORTFS_BLOCK_OPS is not set
 # CONFIG_EXT2_FS is not set
-# CONFIG_EXT2_FS_XATTR is not set
+CONFIG_EXT2_FS_XATTR=y
 # CONFIG_EXT3_FS is not set
 # CONFIG_EXT4_DEBUG is not set
 # CONFIG_EXT4_ENCRYPTION is not set
@@ -1673,24 +1674,6 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_FORCEDETH is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
-# CONFIG_SECURITY_SELINUX_DISABLE is not set
-# CONFIG_SECURITY_SELINUX_DEVELOP is not set
-# CONFIG_SECURITY_SELINUX_AVC_STATS is not set
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
-# CONFIG_SECURITY_SMACK is not set
-# CONFIG_SECURITY_TOMOYO is not set
-# CONFIG_SECURITY_APPARMOR is not set
-# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
-# CONFIG_SECURITY_SAFESETID is not set
-# CONFIG_SECURITY_LOCKDOWN_LSM is not set
-# CONFIG_INTEGRITY is not set
-# CONFIG_INTEGRITY_SIGNATURE is not set
-# CONFIG_INTEGRITY_AUDIT is not set
-# CONFIG_IMA is not set
-# CONFIG_EVM is not set
-# CONFIG_LSM is not set
 # CONFIG_FPGA is not set
 # CONFIG_FRAMEBUFFER_CONSOLE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@@ -2020,8 +2003,8 @@ CONFIG_HPET_MMAP_DEFAULT=y
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTS221 is not set
 # CONFIG_HTU21 is not set
-# CONFIG_HUGETLB_PAGE is not set
 # CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_HVC_UDBG is not set
 # CONFIG_HWLAT_TRACER is not set
@@ -2204,6 +2187,7 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IKHEADERS is not set
+# CONFIG_IMA is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
 # CONFIG_IMGPDC_WDT is not set
 # CONFIG_IMG_MDC_DMA is not set
@@ -2336,6 +2320,9 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_WISTRON_BTNS is not set
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INT340X_THERMAL is not set
+# CONFIG_INTEGRITY is not set
+# CONFIG_INTEGRITY_AUDIT is not set
+# CONFIG_INTEGRITY_SIGNATURE is not set
 # CONFIG_INTEL_ATOMISP2_PM is not set
 # CONFIG_INTEL_CHT_INT33FE is not set
 # CONFIG_INTEL_HID_EVENT is not set
@@ -2759,6 +2746,7 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 # CONFIG_LP_CONSOLE is not set
 # CONFIG_LSI_ET1011C_PHY is not set
 CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity"
+CONFIG_LSM_MMAP_MIN_ADDR=65536
 # CONFIG_LTC1660 is not set
 # CONFIG_LTC2471 is not set
 # CONFIG_LTC2485 is not set
@@ -2998,8 +2986,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MICROSEMI_PHY is not set
 # CONFIG_MIGRATION is not set
 CONFIG_MII=y
-# CONFIG_MIKROTIK_RB532 is not set
 # CONFIG_MIKROTIK is not set
+# CONFIG_MIKROTIK_RB532 is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
 # CONFIG_MINIX_SUBPARTITION is not set
@@ -3386,19 +3374,19 @@ CONFIG_NETDEVICES=y
 # CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 # CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
+# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
 # CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
-# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
 # CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETLABEL is not set
 # CONFIG_NETLINK_DIAG is not set
 # CONFIG_NETLINK_MMAP is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NETROM is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-# CONFIG_NETLABEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETXEN_NIC is not set
 # CONFIG_NET_9P is not set
@@ -4300,7 +4288,7 @@ CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_FS_POSIX_ACL is not set
 # CONFIG_REISERFS_FS_SECURITY is not set
-# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_REISERFS_FS_XATTR=y
 # CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_RELAY is not set
 # CONFIG_RELOCATABLE is not set
@@ -4596,9 +4584,20 @@ CONFIG_SCSI_PROC_FS=y
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_APPARMOR is not set
-CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_SECURITY_DMESG_RESTRICT=y
+# CONFIG_SECURITY_LOADPIN is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+# CONFIG_SECURITY_PATH is not set
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_SELINUX_AVC_STATS is not set
+# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=0
+# CONFIG_SECURITY_SELINUX_DEVELOP is not set
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_YAMA is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSIRION_SGP30 is not set
 # CONFIG_SENSORS_ABITUGURU is not set
@@ -5825,7 +5824,7 @@ CONFIG_TTY=y
 # CONFIG_UBIFS_FS_AUTHENTICATION is not set
 # CONFIG_UBIFS_FS_ENCRYPTION is not set
 # CONFIG_UBIFS_FS_SECURITY is not set
-# CONFIG_UBIFS_FS_XATTR is not set
+CONFIG_UBIFS_FS_XATTR=y
 # CONFIG_UBSAN is not set
 CONFIG_UBSAN_ALIGNMENT=y
 # CONFIG_UCB1400_CORE is not set

target/linux/imx6/config-5.4

@@ -195,7 +195,6 @@ CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_F2FS_FS=y
-CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_STAT_FS=y
 CONFIG_FEC=y
 CONFIG_FIXED_PHY=y
@@ -514,7 +513,6 @@ CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
 CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_XATTR=y
 CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UBIFS_FS_ZSTD=y
 # CONFIG_UCLAMP_TASK is not set

target/linux/ipq40xx/base-files/etc/board.d/01_leds

@@ -26,12 +26,6 @@ avm,fritzbox-7530 |\
 glinet,gl-b1300)
 	ucidef_set_led_wlan "wlan" "WLAN" "green:wlan" "phy0tpt"
 	;;
-edgecore,ecw5211 |\
-zyxel,nbg6617 |\
-zyxel,wre6606)
-	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt"
-	ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt"
-	;;
 edgecore,oap100)
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt"
 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wlan5g" "phy1tpt"
@@ -67,6 +61,11 @@ qxwlan,e2600ac-c2)
 	ucidef_set_led_wlan "wlan2g" "WLAN0" "green:wlan0" "phy0tpt"
 	ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt"
 	;;
+zyxel,nbg6617 |\
+zyxel,wre6606)
+	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt"
+	ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt"
+	;;
 esac
 
 board_config_flush

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
 #include "qcom-ipq4019.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
@@ -12,6 +14,7 @@
 		led-failsafe = &led_power;
 		led-running = &led_power;
 		led-upgrade = &led_power;
+		label-mac-device = &gmac0;
 	};
 
 	chosen {
@@ -39,11 +42,13 @@
 		wlan2g {
 			label = "green:wlan2g";
 			gpios = <&tlmm 3 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "phy0tpt";
 		};
 
 		wlan5g {
 			label = "green:wlan5g";
 			gpios = <&tlmm 2 GPIO_ACTIVE_HIGH>;
+			linux,default-trigger = "phy1tpt";
 		};
 	};
 
@@ -52,13 +57,6 @@
 			status = "okay";
 		};
 
-		mdio@90000 {
-			status = "okay";
-
-			pinctrl-0 = <&mdio_pins>;
-			pinctrl-names = "default";
-		};
-
 		ess-psgmii@98000 {
 			status = "okay";
 		};
@@ -75,8 +73,6 @@
 		};
 
 		tcsr@194b000 {
-			status = "okay";
-
 			compatible = "qcom,tcsr";
 			reg = <0x194b000 0x100>;
 			qcom,usb-hsphy-mode-select = <TCSR_USB_HSPHY_HOST_MODE>;
@@ -94,12 +90,17 @@
 			qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
 		};
 
-		usb2: usb2@60f8800 {
+		usb2@60f8800 {
 			status = "okay";
 		};
 
-		usb3: usb3@8af8800 {
+		usb3@8af8800 {
 			status = "okay";
+
+			dwc3@8a00000 {
+				phys = <&usb3_hs_phy>;
+				phy-names = "usb2-phy";
+			};
 		};
 
 		crypto@8e3a000 {
@@ -112,6 +113,9 @@
 
 		ess-switch@c000000 {
 			status = "okay";
+
+			switch_lan_bmp = <0x10>;
+			switch_wan_bmp = <0x20>;
 		};
 
 		edma@c080000 {
@@ -182,8 +186,6 @@
 	cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>, <&tlmm 4 GPIO_ACTIVE_HIGH>;
 
 	flash@0 {
-		status = "okay";
-
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <24000000>;
@@ -224,9 +226,8 @@
 			};
 
 			partition@e0000 {
-				label = "0:APPSBLENV"; /* uboot env*/
+				label = "0:APPSBLENV"; /* uboot env */
 				reg = <0x000e0000 0x00010000>;
-				read-only;
 			};
 
 			partition@f0000 {
@@ -243,9 +244,7 @@
 		};
 	};
 
-	spi-nand@1 {
+	flash@1 {
-		status = "okay";
-
 		compatible = "spi-nand";
 		reg = <1>;
 		spi-max-frequency = <24000000>;
@@ -286,34 +285,33 @@
 	status = "okay";
 };
 
+&mdio {
+	status = "okay";
+
+	pinctrl-0 = <&mdio_pins>;
+	pinctrl-names = "default";
+};
+
 &gmac0 {
 	qcom,poll_required = <1>;
-	qcom,poll_required_dynamic = <1>;
 	qcom,phy_mdio_addr = <4>;
 	vlan_tag = <2 0x20>;
 };
 
 &gmac1 {
 	qcom,poll_required = <1>;
-	qcom,poll_required_dynamic = <1>;
 	qcom,phy_mdio_addr = <3>;
 	vlan_tag = <1 0x10>;
 };
 
 &wifi0 {
 	status = "okay";
-
-	qcom,ath10k-calibration-variant = "Edgecore-ECW5211";
 };
 
 &wifi1 {
 	status = "okay";
 
-	qcom,ath10k-calibration-variant = "Edgecore-ECW5211";
+	qcom,ath10k-calibration-variant = "ALFA-Network-AP120C-AC";
-};
-
-&usb3_ss_phy {
-	status = "okay";
 };
 
 &usb3_hs_phy {

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts

@@ -1,21 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019-ap.dk04.1.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. IPQ40xx/AP-DK04.1-C1";
-};

target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi

@@ -1,181 +0,0 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "qcom-ipq4019.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-	model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK04.1";
-	compatible = "qcom,ipq4019";
-
-	soc {
-		rng@22000 {
-			status = "okay";
-		};
-
-		pinctrl@1000000 {
-			serial_0_pins: serial_pinmux {
-				mux {
-					pins = "gpio16", "gpio17";
-					function = "blsp_uart0";
-					bias-disable;
-				};
-			};
-
-			serial_1_pins: serial1_pinmux {
-				mux {
-					pins = "gpio8", "gpio9";
-					function = "blsp_uart1";
-					bias-disable;
-				};
-			};
-
-			spi_0_pins: spi_0_pinmux {
-				pinmux {
-					function = "blsp_spi0";
-					pins = "gpio13", "gpio14", "gpio15";
-				};
-				pinmux_cs {
-					function = "gpio";
-					pins = "gpio12";
-				};
-				pinconf {
-					pins = "gpio13", "gpio14", "gpio15";
-					drive-strength = <12>;
-					bias-disable;
-				};
-				pinconf_cs {
-					pins = "gpio12";
-					drive-strength = <2>;
-					bias-disable;
-					output-high;
-				};
-			};
-
-			i2c_0_pins: i2c_0_pinmux {
-				pinmux {
-					function = "blsp_i2c0";
-					pins = "gpio10", "gpio11";
-				};
-				pinconf {
-					pins = "gpio10", "gpio11";
-					drive-strength = <16>;
-					bias-disable;
-				};
-			};
-
-			nand_pins: nand_pins {
-
-				pullups {
-					pins = "gpio52", "gpio53", "gpio58",
-						"gpio59";
-					function = "qpic";
-					bias-pull-up;
-				};
-
-				pulldowns {
-					pins = "gpio54", "gpio55", "gpio56",
-						"gpio57", "gpio60", "gpio61",
-						"gpio62", "gpio63", "gpio64",
-						"gpio65", "gpio66", "gpio67",
-						"gpio68", "gpio69";
-					function = "qpic";
-					bias-pull-down;
-				};
-			};
-		};
-
-		blsp_dma: dma@7884000 {
-			status = "okay";
-		};
-
-		spi0: spi@78b5000 {
-			pinctrl-0 = <&spi_0_pins>;
-			pinctrl-names = "default";
-			status = "okay";
-			cs-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
-
-			mx25l25635e@0 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-				reg = <0>;
-				compatible = "mx25l25635e";
-				spi-max-frequency = <24000000>;
-			};
-		};
-
-		i2c0: i2c@78b7000 { /* BLSP1 QUP2 */
-			pinctrl-0 = <&i2c_0_pins>;
-			pinctrl-names = "default";
-
-			status = "okay";
-		};
-
-		serial@78af000 {
-			pinctrl-0 = <&serial_0_pins>;
-			pinctrl-names = "default";
-			status = "okay";
-		};
-
-		serial@78b0000 {
-			pinctrl-0 = <&serial_1_pins>;
-			pinctrl-names = "default";
-			status = "okay";
-		};
-
-		usb3_ss_phy: ssphy@9a000 {
-			status = "okay";
-		};
-
-		usb3_hs_phy: hsphy@a6000 {
-			status = "okay";
-		};
-
-		usb3: usb3@8af8800 {
-			status = "okay";
-		};
-
-		usb2_hs_phy: hsphy@a8000 {
-			status = "okay";
-		};
-
-		usb2: usb2@60f8800 {
-			status = "okay";
-		};
-
-		cryptobam: dma@8e04000 {
-			status = "okay";
-		};
-
-		crypto@8e3a000 {
-			status = "okay";
-		};
-
-		watchdog@b017000 {
-			status = "okay";
-		};
-
-		qpic_bam: dma@7984000 {
-			status = "okay";
-		};
-
-		nand: qpic-nand@79b0000 {
-			pinctrl-0 = <&nand_pins>;
-			pinctrl-names = "default";
-			status = "okay";
-		};
-	};
-};

target/linux/ipq40xx/image/Makefile

@@ -347,12 +347,12 @@ TARGET_DEVICES += dlink_dap-2610
 define Device/edgecore_ecw5211
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
-	DEVICE_TITLE := Edgecore ECW5211
+	DEVICE_VENDOR := Edgecore
+	DEVICE_MODEL := ECW5211
+	SOC := qcom-ipq4018
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
-	DEVICE_DTS_CONFIG := config@ap.dk01.1-c2
+	DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools
-	DEVICE_DTS := qcom-ipq4018-ecw5211
-	DEVICE_PACKAGES := ipq-wifi-edgecore_ecw5211 kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools
 endef
 TARGET_DEVICES += edgecore_ecw5211
 

target/linux/ipq40xx/patches-5.4/902-dts-ipq4019-ap-dk04.1.patch

@@ -0,0 +1,167 @@
+--- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
+@@ -17,53 +17,79 @@
+ 		stdout-path = "serial0:115200n8";
+ 	};
+ 
+-	memory {
+-		device_type = "memory";
+-		reg = <0x80000000 0x10000000>; /* 256MB */
+-	};
+-
+ 	soc {
++		rng@22000 {
++			status = "okay";
++		};
++
+ 		pinctrl@1000000 {
+ 			serial_0_pins: serial0-pinmux {
+-				pins = "gpio16", "gpio17";
+-				function = "blsp_uart0";
+-				bias-disable;
++				mux {
++					pins = "gpio16", "gpio17";
++					function = "blsp_uart0";
++					bias-disable;
++				};
+ 			};
+ 
+ 			serial_1_pins: serial1-pinmux {
+-				pins = "gpio8", "gpio9",
+-					"gpio10", "gpio11";
+-				function = "blsp_uart1";
+-				bias-disable;
++				mux {
++					pins = "gpio8", "gpio9";
++					function = "blsp_uart1";
++					bias-disable;
++				};
+ 			};
+ 
+ 			spi_0_pins: spi-0-pinmux {
+ 				pinmux {
+ 					function = "blsp_spi0";
+ 					pins = "gpio13", "gpio14", "gpio15";
+-					bias-disable;
+ 				};
+ 				pinmux_cs {
+ 					function = "gpio";
+ 					pins = "gpio12";
++				};
++				pinconf {
++					pins = "gpio13", "gpio14", "gpio15";
++					drive-strength = <12>;
++					bias-disable;
++				};
++				pinconf_cs {
++					pins = "gpio12";
++					drive-strength = <2>;
+ 					bias-disable;
+ 					output-high;
+ 				};
+ 			};
+ 
+ 			i2c_0_pins: i2c-0-pinmux {
+-				pins = "gpio20", "gpio21";
+-				function = "blsp_i2c0";
+-				bias-disable;
++				pinmux {
++					function = "blsp_i2c0";
++					pins = "gpio10", "gpio11";
++				};
++				pinconf {
++					pins = "gpio10", "gpio11";
++					drive-strength = <16>;
++					bias-disable;
++				};
+ 			};
+ 
+ 			nand_pins: nand-pins {
+-				pins = "gpio53", "gpio55", "gpio56",
+-					"gpio57", "gpio58", "gpio59",
+-					"gpio60", "gpio62", "gpio63",
+-					"gpio64", "gpio65", "gpio66",
+-					"gpio67", "gpio68", "gpio69";
+-				function = "qpic";
++				pullups {
++					pins = "gpio52", "gpio53", "gpio58",
++						"gpio59";
++					function = "qpic";
++					bias-pull-up;
++				};
++
++				pulldowns {
++					pins = "gpio54", "gpio55", "gpio56",
++						"gpio57", "gpio60", "gpio61",
++						"gpio62", "gpio63", "gpio64",
++						"gpio65", "gpio66", "gpio67",
++						"gpio68", "gpio69";
++					function = "qpic";
++					bias-pull-down;
++				};
+ 			};
+ 		};
+ 
+@@ -89,23 +115,57 @@
+ 			status = "ok";
+ 			cs-gpios = <&tlmm 12 0>;
+ 
+-			m25p80@0 {
++			mx25l25635e@0 {
+ 				#address-cells = <1>;
+ 				#size-cells = <1>;
+ 				reg = <0>;
+-				compatible = "n25q128a11";
++				compatible = "mx25l25635e";
+ 				spi-max-frequency = <24000000>;
+ 			};
+ 		};
+ 
+-		pci@40000000 {
+-			status = "ok";
+-			perst-gpio = <&tlmm 38 0x1>;
++		i2c0: i2c@78b7000 { /* BLSP1 QUP2 */
++			pinctrl-0 = <&i2c_0_pins>;
++			pinctrl-names = "default";
++
++			status = "okay";
+ 		};
+ 
+ 		qpic-nand@79b0000 {
+ 			pinctrl-0 = <&nand_pins>;
+ 			pinctrl-names = "default";
+ 		};
++
++		usb3_ss_phy: ssphy@9a000 {
++			status = "okay";
++		};
++
++		usb3_hs_phy: hsphy@a6000 {
++			status = "okay";
++		};
++
++		usb3: usb3@8af8800 {
++			status = "okay";
++		};
++
++		usb2_hs_phy: hsphy@a8000 {
++			status = "okay";
++		};
++
++		usb2: usb2@60f8800 {
++			status = "okay";
++		};
++
++		cryptobam: dma@8e04000 {
++			status = "okay";
++		};
++
++		crypto@8e3a000 {
++			status = "okay";
++		};
++
++		watchdog@b017000 {
++			status = "okay";
++		};
+ 	};
+ };

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
 

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

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

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>;
 		};
 	};

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";
 		};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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";
 		};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 		/*

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 		/*

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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";
 		};

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";
 		};

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>;
 		};
 	};

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";
 		};

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";
 		};

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>;
 		};
 	};

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>;
 		};
 	};

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";
 		};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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 {

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 {

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 {

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>;
 		};
 	};

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>;
 		};
 

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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";
 		};

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>;
 		};
 	};	

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>;
 		};
 	};	

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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";
 		};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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";
 		};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 		/*

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 		/*

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>;
 		};
 	};

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>;
 		};
 	};

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>;
 		};
 	};

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";
 		};

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";
 		};

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>;
 		};
 	};

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";
 		};

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";
 		};