ipq806x: remove model name from LED labels

Like in the previous patches for ath79 and ramips, this will remove
the "devicename" from LED labels in ipq806x.

The devicename is removed in DTS files and 01_leds, and a migration
script is added.

Signed-off-by: Adrian Schmutzler <[email protected]>

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

@@ -8,50 +8,49 @@
 board_config_update
 
 board=$(board_name)
-boardname="${board##*,}"
 
 case "$board" in
 buffalo,wxr-2533dhp)
-	ucidef_set_led_wlan "wlan" "WLAN" "${boardname}:white:wireless" "phy0tpt"
-	ucidef_set_led_switch "wan" "WAN" "${boardname}:white:internet" "switch0" "0x20"
+	ucidef_set_led_wlan "wlan" "WLAN" "white:wireless" "phy0tpt"
+	ucidef_set_led_switch "wan" "WAN" "white:internet" "switch0" "0x20"
 	;;
 compex,wpq864)
-	ucidef_set_led_usbport "usb" "USB" "wpq864:green:usb" "usb1-port1" "usb2-port1"
-	ucidef_set_led_usbport "pcie-usb" "PCIe USB" "wpq864:green:usb-pcie" "usb3-port1"
+	ucidef_set_led_usbport "usb" "USB" "green:usb" "usb1-port1" "usb2-port1"
+	ucidef_set_led_usbport "pcie-usb" "PCIe USB" "green:usb-pcie" "usb3-port1"
 	;;
 edgecore,ecw5410)
-	ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:green:wlan2g" "phy1tpt"
-	ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:green:wlan5g" "phy0tpt"
+	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy1tpt"
+	ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy0tpt"
 	;;
 nec,wg2600hp)
-	ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:green:wlan2g" "phy1tpt"
-	ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:green:wlan5g" "phy0tpt"
-	ucidef_set_led_switch "wan" "WAN" "${boardname}:green:active" "switch0" "0x2"
+	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy1tpt"
+	ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy0tpt"
+	ucidef_set_led_switch "wan" "WAN" "green:active" "switch0" "0x2"
 	;;
 netgear,d7800 |\
 netgear,r7500 |\
 netgear,r7500v2 |\
 netgear,r7800)
-	ucidef_set_led_usbport "usb1" "USB 1" "${boardname}:white:usb1" "usb1-port1" "usb2-port1"
-	ucidef_set_led_usbport "usb2" "USB 2" "${boardname}:white:usb2" "usb3-port1" "usb4-port1"
-	ucidef_set_led_switch "wan" "WAN" "${boardname}:white:wan" "switch0" "0x20"
-	ucidef_set_led_ide "esata" "eSATA" "${boardname}:white:esata"
+	ucidef_set_led_usbport "usb1" "USB 1" "white:usb1" "usb1-port1" "usb2-port1"
+	ucidef_set_led_usbport "usb2" "USB 2" "white:usb2" "usb3-port1" "usb4-port1"
+	ucidef_set_led_switch "wan" "WAN" "white:wan" "switch0" "0x20"
+	ucidef_set_led_ide "esata" "eSATA" "white:esata"
 	;;
 tplink,c2600)
-	ucidef_set_led_usbport "usb1" "USB 1" "${boardname}:white:usb_2" "usb1-port1" "usb2-port1"
-	ucidef_set_led_usbport "usb2" "USB 2" "${boardname}:white:usb_4" "usb3-port1" "usb4-port1"
-	ucidef_set_led_switch "wan" "wan" "${boardname}:white:wan" "switch0" "0x20"
-	ucidef_set_led_switch "lan" "lan" "${boardname}:white:lan" "switch0" "0x1e"
+	ucidef_set_led_usbport "usb1" "USB 1" "white:usb_2" "usb1-port1" "usb2-port1"
+	ucidef_set_led_usbport "usb2" "USB 2" "white:usb_4" "usb3-port1" "usb4-port1"
+	ucidef_set_led_switch "wan" "wan" "white:wan" "switch0" "0x20"
+	ucidef_set_led_switch "lan" "lan" "white:lan" "switch0" "0x1e"
 	;;
 tplink,vr2600v)
-	ucidef_set_led_usbport "usb" "USB" "${boardname}:white:usb" "usb1-port1" "usb2-port1" "usb3-port1" "usb4-port1"
-	ucidef_set_led_switch "lan" "lan" "${boardname}:white:lan" "switch0" "0x1e"
-	ucidef_set_led_wlan "wlan2g" "WLAN2G" "${boardname}:white:wlan2g" "phy0tpt"
-	ucidef_set_led_wlan "wlan5g" "WLAN5G" "${boardname}:white:wlan5g" "phy1tpt"
-	ucidef_set_led_switch "wan" "wan" "${boardname}:white:wan" "switch0" "0x20"
+	ucidef_set_led_usbport "usb" "USB" "white:usb" "usb1-port1" "usb2-port1" "usb3-port1" "usb4-port1"
+	ucidef_set_led_switch "lan" "lan" "white:lan" "switch0" "0x1e"
+	ucidef_set_led_wlan "wlan2g" "WLAN2G" "white:wlan2g" "phy0tpt"
+	ucidef_set_led_wlan "wlan5g" "WLAN5G" "white:wlan5g" "phy1tpt"
+	ucidef_set_led_switch "wan" "wan" "white:wan" "switch0" "0x20"
 	;;
 zyxel,nbg6817)
-	ucidef_set_led_netdev "wan" "WAN" "${boardname}:white:internet" "eth1"
+	ucidef_set_led_netdev "wan" "WAN" "white:internet" "eth1"
 	;;
 esac
 

target/linux/ipq806x/base-files/etc/uci-defaults/04_led_migration

@@ -0,0 +1,7 @@
+. /lib/functions/migrations.sh
+
+remove_devicename_leds
+
+migrations_apply system
+
+exit 0

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts

@@ -432,43 +432,43 @@
 		pinctrl-names = "default";
 
 		lan {
-			label = "c2600:white:lan";
+			label = "white:lan";
 			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb4 {
-			label = "c2600:white:usb_4";
+			label = "white:usb_4";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb2 {
-			label = "c2600:white:usb_2";
+			label = "white:usb_2";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "c2600:white:wps";
+			label = "white:wps";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_amber {
-			label = "c2600:amber:wan";
+			label = "amber:wan";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_white {
-			label = "c2600:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 33 GPIO_ACTIVE_LOW>;
 		};
 
 		power: power {
-			label = "c2600:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		general: general {
-			label = "c2600:white:general";
+			label = "white:general";
 			gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts

@@ -344,48 +344,48 @@
 		pinctrl-names = "default";
 
 		usb1 {
-			label = "d7800:white:usb1";
+			label = "white:usb1";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb2 {
-			label = "d7800:white:usb2";
+			label = "white:usb2";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_amber: power_amber {
-			label = "d7800:amber:power";
+			label = "amber:power";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_white {
-			label = "d7800:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_amber {
-			label = "d7800:amber:wan";
+			label = "amber:wan";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "d7800:white:wps";
+			label = "white:wps";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 		};
 
 		esata {
-			label = "d7800:white:esata";
+			label = "white:esata";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_white: power_white {
-			label = "d7800:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		wifi {
-			label = "d7800:white:wifi";
+			label = "white:wifi";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts

@@ -370,18 +370,18 @@
 		pinctrl-names = "default";
 
 		wps {
-			label = "ea8500:green:wps";
+			label = "green:wps";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 		};
 
 		power: power {
-			label = "ea8500:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wifi {
-			label = "ea8500:green:wifi";
+			label = "green:wifi";
 			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts

@@ -309,48 +309,48 @@
 		pinctrl-names = "default";
 
 		usb1 {
-			label = "r7500:white:usb1";
+			label = "white:usb1";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb2 {
-			label = "r7500:white:usb2";
+			label = "white:usb2";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_amber: power_amber {
-			label = "r7500:amber:power";
+			label = "amber:power";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_white {
-			label = "r7500:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_amber {
-			label = "r7500:amber:wan";
+			label = "amber:wan";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "r7500:white:wps";
+			label = "white:wps";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 		};
 
 		esata {
-			label = "r7500:white:esata";
+			label = "white:esata";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_white: power_white {
-			label = "r7500:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		wifi {
-			label = "r7500:white:wifi";
+			label = "white:wifi";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts

@@ -343,48 +343,48 @@
 		pinctrl-names = "default";
 
 		usb1 {
-			label = "r7500v2:amber:usb1";
+			label = "amber:usb1";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb3 {
-			label = "r7500v2:amber:usb3";
+			label = "amber:usb3";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		status {
-			label = "r7500v2:amber:status";
+			label = "amber:status";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet {
-			label = "r7500v2:white:internet";
+			label = "white:internet";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan {
-			label = "r7500v2:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "r7500v2:white:wps";
+			label = "white:wps";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 		};
 
 		esata {
-			label = "r7500v2:white:esata";
+			label = "white:esata";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 		};
 
 		power: power {
-			label = "r7500v2:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		wifi {
-			label = "r7500v2:white:wifi";
+			label = "white:wifi";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts

@@ -350,48 +350,48 @@
 		pinctrl-names = "default";
 
 		dsl {
-			label = "vr2600v:white:dsl";
+			label = "white:dsl";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb {
-			label = "vr2600v:white:usb";
+			label = "white:usb";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan {
-			label = "vr2600v:white:lan";
+			label = "white:lan";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan2g {
-			label = "vr2600v:white:wlan2g";
+			label = "white:wlan2g";
 			gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan5g {
-			label = "vr2600v:white:wlan5g";
+			label = "white:wlan5g";
 			gpios = <&qcom_pinmux 17 GPIO_ACTIVE_HIGH>;
 		};
 
 		power: power {
-			label = "vr2600v:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		phone {
-			label = "vr2600v:white:phone";
+			label = "white:phone";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan {
-			label = "vr2600v:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>;
 		};
 
 		general: general {
-			label = "vr2600v:white:general";
+			label = "white:general";
 			gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts

@@ -101,62 +101,62 @@
 		pinctrl-names = "default";
 
 		converter_green {
-			label = "wg2600hp:green:converter";
+			label = "green:converter";
 			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_red: power_red {
-			label = "wg2600hp:red:power";
+			label = "red:power";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		active_green {
-			label = "wg2600hp:green:active";
+			label = "green:active";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		active_red {
-			label = "wg2600hp:red:active";
+			label = "red:active";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_green: power_green {
-			label = "wg2600hp:green:power";
+			label = "green:power";
 			gpios = <&qcom_pinmux 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		converter_red {
-			label = "wg2600hp:red:converter";
+			label = "red:converter";
 			gpios = <&qcom_pinmux 15 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan2g_green {
-			label = "wg2600hp:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan2g_red {
-			label = "wg2600hp:red:wlan2g";
+			label = "red:wlan2g";
 			gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan5g_green {
-			label = "wg2600hp:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&qcom_pinmux 57 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan5g_red {
-			label = "wg2600hp:red:wlan5g";
+			label = "red:wlan5g";
 			gpios = <&qcom_pinmux 58 GPIO_ACTIVE_HIGH>;
 		};
 
 		tv_green {
-			label = "wg2600hp:green:tv";
+			label = "green:tv";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 
 		tv_red {
-			label = "wg2600hp:red:tv";
+			label = "red:tv";
 			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts

@@ -254,43 +254,43 @@
 		pinctrl-names = "default";
 
 		rss4 {
-			label = "wpq864:green:rss4";
+			label = "green:rss4";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		rss3 {
-			label = "wpq864:green:rss3";
+			label = "green:rss3";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		rss2 {
-			label = "wpq864:orange:rss2";
+			label = "orange:rss2";
 			gpios = <&qcom_pinmux 25 GPIO_ACTIVE_HIGH>;
 		};
 
 		rss1 {
-			label = "wpq864:red:rss1";
+			label = "red:rss1";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_pass: pass {
-			label = "wpq864:green:pass";
+			label = "green:pass";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_fail: fail {
-			label = "wpq864:green:fail";
+			label = "green:fail";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb {
-			label = "wpq864:green:usb";
+			label = "green:usb";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb-pcie {
-			label = "wpq864:green:usb-pcie";
+			label = "green:usb-pcie";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts

@@ -108,54 +108,54 @@
 		pinctrl-names = "default";
 
 		usb {
-			label = "wxr-2533dhp:green:usb";
+			label = "green:usb";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "usbport";
 			trigger-sources = <&hub_port0 &hub_port1>;
 		};
 
 		guestport {
-			label = "wxr-2533dhp:green:guestport";
+			label = "green:guestport";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		diag: diag {
-			label = "wxr-2533dhp:orange:diag";
+			label = "orange:diag";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet_orange {
-			label = "wxr-2533dhp:orange:internet";
+			label = "orange:internet";
 			gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet_white {
-			label = "wxr-2533dhp:white:internet";
+			label = "white:internet";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		wireless_orange {
-			label = "wxr-2533dhp:orange:wireless";
+			label = "orange:wireless";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		wireless_white {
-			label = "wxr-2533dhp:white:wireless";
+			label = "white:wireless";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 		};
 
 		router_orange {
-			label = "wxr-2533dhp:orange:router";
+			label = "orange:router";
 			gpios = <&qcom_pinmux 25 GPIO_ACTIVE_HIGH>;
 		};
 
 		router_white {
-			label = "wxr-2533dhp:white:router";
+			label = "white:router";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>;
 		};
 
 		power: power {
-			label = "wxr-2533dhp:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts

@@ -340,25 +340,25 @@
 		pinctrl-names = "default";
 
 		internet {
-			label = "nbg6817:white:internet";
+			label = "white:internet";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 
 		power: power {
-			label = "nbg6817:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		wifi2g {
-			label = "nbg6817:amber:wifi2g";
+			label = "amber:wifi2g";
 			gpios = <&qcom_pinmux 33 GPIO_ACTIVE_HIGH>;
 		};
 
 		/* wifi2g amber from the manual is missing */
 
 		wifi5g {
-			label = "nbg6817:amber:wifi5g";
+			label = "amber:wifi5g";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 		};
 

target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts

@@ -479,48 +479,48 @@
 		pinctrl-names = "default";
 
 		power_white: power_white {
-			label = "r7800:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		power_amber: power_amber {
-			label = "r7800:amber:power";
+			label = "amber:power";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_white {
-			label = "r7800:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_amber {
-			label = "r7800:amber:wan";
+			label = "amber:wan";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb1 {
-			label = "r7800:white:usb1";
+			label = "white:usb1";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb2 {
-			label = "r7800:white:usb2";
+			label = "white:usb2";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		esata {
-			label = "r7800:white:esata";
+			label = "white:esata";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 		};
 
 		wifi {
-			label = "r7800:white:wifi";
+			label = "white:wifi";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "r7800:white:wps";
+			label = "white:wps";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts

@@ -57,43 +57,43 @@
 		pinctrl-names = "default";
 
 		lan {
-			label = "c2600:white:lan";
+			label = "white:lan";
 			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb4 {
-			label = "c2600:white:usb_4";
+			label = "white:usb_4";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb2 {
-			label = "c2600:white:usb_2";
+			label = "white:usb_2";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "c2600:white:wps";
+			label = "white:wps";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_amber {
-			label = "c2600:amber:wan";
+			label = "amber:wan";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>;
 		};
 
 		wan_white {
-			label = "c2600:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 33 GPIO_ACTIVE_LOW>;
 		};
 
 		power: power {
-			label = "c2600:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		general: general {
-			label = "c2600:white:general";
+			label = "white:general";
 			gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts

@@ -54,48 +54,48 @@
 		pinctrl-names = "default";
 
 		usb1 {
-			label = "d7800:white:usb1";
+			label = "white:usb1";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb2 {
-			label = "d7800:white:usb2";
+			label = "white:usb2";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_amber: power_amber {
-			label = "d7800:amber:power";
+			label = "amber:power";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_white {
-			label = "d7800:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_amber {
-			label = "d7800:amber:wan";
+			label = "amber:wan";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "d7800:white:wps";
+			label = "white:wps";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 		};
 
 		esata {
-			label = "d7800:white:esata";
+			label = "white:esata";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_white: power_white {
-			label = "d7800:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		wifi {
-			label = "d7800:white:wifi";
+			label = "white:wifi";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts

@@ -47,7 +47,7 @@
 		pinctrl-names = "default";
 
 		led_power: power {
-			label = "ea7500-v1:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts

@@ -48,18 +48,18 @@
 		pinctrl-names = "default";
 
 		wps {
-			label = "ea8500:green:wps";
+			label = "green:wps";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_power: power {
-			label = "ea8500:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_LOW>;
 			default-state = "keep";
 		};
 
 		wifi {
-			label = "ea8500:green:wifi";
+			label = "green:wifi";
 			gpios = <&qcom_pinmux 54 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts

@@ -65,48 +65,48 @@
 		pinctrl-names = "default";
 
 		usb1 {
-			label = "r7500:white:usb1";
+			label = "white:usb1";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb2 {
-			label = "r7500:white:usb2";
+			label = "white:usb2";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_amber: power_amber {
-			label = "r7500:amber:power";
+			label = "amber:power";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_white {
-			label = "r7500:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_amber {
-			label = "r7500:amber:wan";
+			label = "amber:wan";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "r7500:white:wps";
+			label = "white:wps";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 		};
 
 		esata {
-			label = "r7500:white:esata";
+			label = "white:esata";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_white: power_white {
-			label = "r7500:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		wifi {
-			label = "r7500:white:wifi";
+			label = "white:wifi";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts

@@ -61,48 +61,48 @@
 		pinctrl-names = "default";
 
 		usb1 {
-			label = "r7500v2:amber:usb1";
+			label = "amber:usb1";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb3 {
-			label = "r7500v2:amber:usb3";
+			label = "amber:usb3";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		status {
-			label = "r7500v2:amber:status";
+			label = "amber:status";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet {
-			label = "r7500v2:white:internet";
+			label = "white:internet";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan {
-			label = "r7500v2:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "r7500v2:white:wps";
+			label = "white:wps";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 		};
 
 		esata {
-			label = "r7500v2:white:esata";
+			label = "white:esata";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 		};
 
 		power: power {
-			label = "r7500v2:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		wifi {
-			label = "r7500v2:white:wifi";
+			label = "white:wifi";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts

@@ -62,48 +62,48 @@
 		pinctrl-names = "default";
 
 		dsl {
-			label = "vr2600v:white:dsl";
+			label = "white:dsl";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb {
-			label = "vr2600v:white:usb";
+			label = "white:usb";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		lan {
-			label = "vr2600v:white:lan";
+			label = "white:lan";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan2g {
-			label = "vr2600v:white:wlan2g";
+			label = "white:wlan2g";
 			gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan5g {
-			label = "vr2600v:white:wlan5g";
+			label = "white:wlan5g";
 			gpios = <&qcom_pinmux 17 GPIO_ACTIVE_HIGH>;
 		};
 
 		power: power {
-			label = "vr2600v:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		phone {
-			label = "vr2600v:white:phone";
+			label = "white:phone";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan {
-			label = "vr2600v:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>;
 		};
 
 		general: general {
-			label = "vr2600v:white:general";
+			label = "white:general";
 			gpios = <&qcom_pinmux 66 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts

@@ -58,62 +58,62 @@
 		pinctrl-names = "default";
 
 		converter_green {
-			label = "wg2600hp:green:converter";
+			label = "green:converter";
 			gpios = <&qcom_pinmux 6 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_red: power_red {
-			label = "wg2600hp:red:power";
+			label = "red:power";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		active_green {
-			label = "wg2600hp:green:active";
+			label = "green:active";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		active_red {
-			label = "wg2600hp:red:active";
+			label = "red:active";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		power_green: power_green {
-			label = "wg2600hp:green:power";
+			label = "green:power";
 			gpios = <&qcom_pinmux 14 GPIO_ACTIVE_HIGH>;
 		};
 
 		converter_red {
-			label = "wg2600hp:red:converter";
+			label = "red:converter";
 			gpios = <&qcom_pinmux 15 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan2g_green {
-			label = "wg2600hp:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&qcom_pinmux 55 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan2g_red {
-			label = "wg2600hp:red:wlan2g";
+			label = "red:wlan2g";
 			gpios = <&qcom_pinmux 56 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan5g_green {
-			label = "wg2600hp:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&qcom_pinmux 57 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan5g_red {
-			label = "wg2600hp:red:wlan5g";
+			label = "red:wlan5g";
 			gpios = <&qcom_pinmux 58 GPIO_ACTIVE_HIGH>;
 		};
 
 		tv_green {
-			label = "wg2600hp:green:tv";
+			label = "green:tv";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 
 		tv_red {
-			label = "wg2600hp:red:tv";
+			label = "red:tv";
 			gpios = <&qcom_pinmux 65 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts

@@ -58,43 +58,43 @@
 		pinctrl-names = "default";
 
 		rss4 {
-			label = "wpq864:green:rss4";
+			label = "green:rss4";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		rss3 {
-			label = "wpq864:green:rss3";
+			label = "green:rss3";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		rss2 {
-			label = "wpq864:orange:rss2";
+			label = "orange:rss2";
 			gpios = <&qcom_pinmux 25 GPIO_ACTIVE_HIGH>;
 		};
 
 		rss1 {
-			label = "wpq864:red:rss1";
+			label = "red:rss1";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_pass: pass {
-			label = "wpq864:green:pass";
+			label = "green:pass";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_fail: fail {
-			label = "wpq864:green:fail";
+			label = "green:fail";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb {
-			label = "wpq864:green:usb";
+			label = "green:usb";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb-pcie {
-			label = "wpq864:green:usb-pcie";
+			label = "green:usb-pcie";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts

@@ -30,54 +30,54 @@
 		pinctrl-names = "default";
 
 		usb {
-			label = "wxr-2533dhp:green:usb";
+			label = "green:usb";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "usbport";
 			trigger-sources = <&hub_port0 &hub_port1>;
 		};
 
 		guestport {
-			label = "wxr-2533dhp:green:guestport";
+			label = "green:guestport";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		diag: diag {
-			label = "wxr-2533dhp:orange:diag";
+			label = "orange:diag";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet_orange {
-			label = "wxr-2533dhp:orange:internet";
+			label = "orange:internet";
 			gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>;
 		};
 
 		internet_white {
-			label = "wxr-2533dhp:white:internet";
+			label = "white:internet";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		wireless_orange {
-			label = "wxr-2533dhp:orange:wireless";
+			label = "orange:wireless";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		wireless_white {
-			label = "wxr-2533dhp:white:wireless";
+			label = "white:wireless";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 		};
 
 		router_orange {
-			label = "wxr-2533dhp:orange:router";
+			label = "orange:router";
 			gpios = <&qcom_pinmux 25 GPIO_ACTIVE_HIGH>;
 		};
 
 		router_white {
-			label = "wxr-2533dhp:white:router";
+			label = "white:router";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>;
 		};
 
 		power: power {
-			label = "wxr-2533dhp:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts

@@ -57,25 +57,25 @@
 		pinctrl-names = "default";
 
 		internet {
-			label = "nbg6817:white:internet";
+			label = "white:internet";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 
 		power: power {
-			label = "nbg6817:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		wifi2g {
-			label = "nbg6817:amber:wifi2g";
+			label = "amber:wifi2g";
 			gpios = <&qcom_pinmux 33 GPIO_ACTIVE_HIGH>;
 		};
 
 		/* wifi2g amber from the manual is missing */
 
 		wifi5g {
-			label = "nbg6817:amber:wifi5g";
+			label = "amber:wifi5g";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 		};
 

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts

@@ -64,48 +64,48 @@
 		pinctrl-names = "default";
 
 		power_white: power_white {
-			label = "r7800:white:power";
+			label = "white:power";
 			gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
 			default-state = "keep";
 		};
 
 		power_amber: power_amber {
-			label = "r7800:amber:power";
+			label = "amber:power";
 			gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_white {
-			label = "r7800:white:wan";
+			label = "white:wan";
 			gpios = <&qcom_pinmux 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		wan_amber {
-			label = "r7800:amber:wan";
+			label = "amber:wan";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb1 {
-			label = "r7800:white:usb1";
+			label = "white:usb1";
 			gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
 		};
 
 		usb2 {
-			label = "r7800:white:usb2";
+			label = "white:usb2";
 			gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
 		};
 
 		esata {
-			label = "r7800:white:esata";
+			label = "white:esata";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
 		};
 
 		wifi {
-			label = "r7800:white:wifi";
+			label = "white:wifi";
 			gpios = <&qcom_pinmux 64 GPIO_ACTIVE_HIGH>;
 		};
 
 		wps {
-			label = "r7800:white:wps";
+			label = "white:wps";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_HIGH>;
 		};
 	};

target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts

@@ -66,32 +66,32 @@
 		pinctrl-names = "default";
 
 		led_power_green: power_green {
-			label = "ecw5410:green:power";
+			label = "green:power";
 			gpios = <&qcom_pinmux 16 GPIO_ACTIVE_HIGH>;
 		};
 
 		wlan2g_green {
-			label = "ecw5410:green:wlan2g";
+			label = "green:wlan2g";
 			gpios = <&qcom_pinmux 23 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan2g_yellow {
-			label = "ecw5410:yellow:wlan2g";
+			label = "yellow:wlan2g";
 			gpios = <&qcom_pinmux 24 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g_green {
-			label = "ecw5410:green:wlan5g";
+			label = "green:wlan5g";
 			gpios = <&qcom_pinmux 26 GPIO_ACTIVE_LOW>;
 		};
 
 		led_power_red: power_red {
-			label = "ecw5410:red:power";
+			label = "red:power";
 			gpios = <&qcom_pinmux 28 GPIO_ACTIVE_LOW>;
 		};
 
 		wlan5g_yellow {
-			label = "ecw5410:yellow:wlan5g";
+			label = "yellow:wlan5g";
 			gpios = <&qcom_pinmux 59 GPIO_ACTIVE_LOW>;
 		};
 	};