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 <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ipq806x/base-files/etc/board.d/01_leds b/target/linux/ipq806x/base-files/etc/board.d/01_leds
index 620fc12f41a517a7e55a3ad83cf0581e3bd46bf6..c23f25540b4a7fb12266610b1de8d24fabf32dcd 100755 (executable)
--- a/target/linux/ipq806x/base-files/etc/board.d/01_leds
+++ b/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
 

diff --git a/target/linux/ipq806x/base-files/etc/uci-defaults/04_led_migration b/target/linux/ipq806x/base-files/etc/uci-defaults/04_led_migration
new file mode 100644 (file)
index 0000000..e56062b
--- /dev/null
+++ b/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

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
index d90518bf22ffb5c4524782ef4f08c90c41ecc2a1..027500f03836c9262188efe72ba980b9d6f7f5f8 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index 241c00962a56af9fbf7a266dd84531b729a7344f..ba4bb9022d8ec47dd44e730782db58fb7acc5a7d 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index fc4d64453f66311efd80922da5bf71dd7bb9dabd..1b8ab36c4f019655fa8e8c195bdfe4988265c0ec 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index dd596f52b440a2aa4d57fd166686ad9aa87f2e6e..1d6be1288a4e5fcf48206306b3dddab8931eb71c 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index 463c0abb40153101c4fd61d2a3ddf5661f132cbe..e9d183a8ebc3e21668d07dd2a2c80d84bb0883dc 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
index bdcd302802f6a6a3f799a03fd5cf29a21d6c148b..8c171bc2e31a51b4fa31199d5db026f394663546 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
index 6667b1f473a376a8a73e8cd713258c5b7ddda0e2..58b5296878e0ebcd527063705217aa5ff551a2f5 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
index a1e7791d12df7228e677896abb39be68a974b77c..0347cac4306e19bff09a07c3fb37a993ea8d0221 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
index b4770102e272ccf421702745a6371437595c1713..874e54b4a143ce93719ea9424c0ddacad6ae583c 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
index 378ea775b541efd3a7ca656830907f85a0f21868..2cff2f65bc303f1a1dde430fc938a04377352e62 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ b/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>;
                };
 

diff --git a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index f93039f7272d164cbb755398e37dfef386199a97..50ffcdab07d86f965e2af42c7c3c458579961e90 100644 (file)
--- a/target/linux/ipq806x/files-4.19/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
index 2d5685558e8545dc1a4c66f2b9ba9fd411f06a69..4ae7de604b4d0b79045f171e778966f19a456406 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index 3183ac3f9c61aedf5541134d3e94052a1a6f94f1..7fb871be787598a4f2443e85d55de55bf1fcfa09 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts
index 5601a5c7779cb1868fdae15ceb5f9c3ed5e8c84f..176807163e10d66de5e585e538c575540bb0c77f 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts
+++ b/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";
                };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index 18182b88d034dca2d9e7bb6cf7c156156bcd8d74..9b01ae03282a497384c6c71076b0ed20dbca286e 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index 082ae509495b3dac440eec29b148eb8c3d9b7787..ed8ab3dbfadd436f50f232ce3adbe40e0a58ff38 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index dc912a990cb94a783e1853a56815854f3cceaf0a..20a1fad7b2babe21656ac3f0573471faf772fa25 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
index 2f46b220a8e43ff7a3b239120c677710ff488cd0..ea7d0235cedc7a496719878a022723404b81d413 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
index 8120eee142d2e4369547afc75160459bab56d74d..1a6b7eb4d67005f2292a01d1ec8d87b086ea411a 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
index c4d2187ef63b09cd6648fe91915a13720f4013a9..739b7261a318fba4c2cc4d458ad6c5c8515af785 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
index 476c6bab408b002509fbdc0256c01458a594da9c..d80bfa204d0320f46d0526c74afb6bb22f685817 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
index 781394f75a07471b3abe9152e36b5f24f3099e3a..2573349f55e4c48f8820f796d4ee10072581d58a 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ b/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>;
                };
 

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index 89c1a5653cd3d551f6c55017666dbdbc9186e2b6..181f6d3bde19b1dbdf9a77ed7feb8a721b4fe461 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/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>;
                };
        };

diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
index 9d6afa1c8aed3ef83003bb356479498900b9ea49..712910c2610f6d69b99a19e6dce40d05acaf6ed1 100644 (file)
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
+++ b/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>;
                };
        };