From 0cf8475a546f97427d7e0d1b6bd91e4ab5d881a1 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Mon, 8 Oct 2018 11:04:12 +0800
Subject: [PATCH] ramips:support Phicomm K2P multiple leds in one light

---
 .../ramips/base-files/etc/board.d/01_leds     | 105 ------------------
 target/linux/ramips/base-files/etc/diag.sh    |  29 ++++-
 target/linux/ramips/dts/11ACNAS.dts           |   2 +
 target/linux/ramips/dts/3G-6200N.dts          |   7 +-
 target/linux/ramips/dts/3G-6200NL.dts         |   5 +-
 target/linux/ramips/dts/3G150B.dts            |   7 +-
 target/linux/ramips/dts/3G300M.dts            |   7 +-
 target/linux/ramips/dts/A5-V11.dts            |   5 +-
 target/linux/ramips/dts/AC1200RM.dts          |   3 +-
 target/linux/ramips/dts/AI-BR100.dts          |   5 +-
 target/linux/ramips/dts/AIR3GII.dts           |   2 +
 target/linux/ramips/dts/ALL0239-3G.dts        |   7 +-
 target/linux/ramips/dts/AR670W.dts            |   5 +-
 target/linux/ramips/dts/AR725W.dts            |   5 +-
 target/linux/ramips/dts/ASL26555.dtsi         |   7 +-
 target/linux/ramips/dts/ATP-52B.dts           |   5 +-
 target/linux/ramips/dts/AWAPN2403.dts         |   5 +-
 target/linux/ramips/dts/AWUSFREE1.dts         |   5 +-
 target/linux/ramips/dts/ArcherC2-v1.dts       |   7 +-
 target/linux/ramips/dts/ArcherC20i.dts        |   2 +
 target/linux/ramips/dts/ArcherC20v1.dts       |   7 +-
 target/linux/ramips/dts/ArcherC20v4.dts       |   5 +-
 target/linux/ramips/dts/ArcherC50.dts         |   7 +-
 target/linux/ramips/dts/ArcherC50V3.dts       |   5 +-
 target/linux/ramips/dts/ArcherMR200.dts       |   5 +-
 target/linux/ramips/dts/BC2.dts               |   2 +
 target/linux/ramips/dts/BR-6475ND.dts         |   5 +-
 target/linux/ramips/dts/BR-6478AC-V2.dts      |   7 +-
 target/linux/ramips/dts/BROADWAY.dts          |   2 +
 target/linux/ramips/dts/C108.dts              |   5 +-
 target/linux/ramips/dts/CF-WR800N.dts         |   5 +-
 target/linux/ramips/dts/CS-QR10.dts           |   5 +-
 target/linux/ramips/dts/CY-SWR1100.dts        |   5 +-
 target/linux/ramips/dts/D105.dts              |   7 +-
 target/linux/ramips/dts/D240.dts              |   7 +-
 target/linux/ramips/dts/DAP-1350.dts          |   5 +-
 target/linux/ramips/dts/DAP-1522-A1.dts       |   5 +-
 target/linux/ramips/dts/DB-WRT01.dts          |   5 +-
 target/linux/ramips/dts/DCH-M225.dts          |   5 +-
 target/linux/ramips/dts/DCS-930.dts           |   5 +-
 target/linux/ramips/dts/DCS-930L-B1.dts       |   5 +-
 target/linux/ramips/dts/DIR-300-B1.dts        |   5 +-
 target/linux/ramips/dts/DIR-300-B7.dts        |   5 +-
 target/linux/ramips/dts/DIR-320-B1.dts        |   5 +-
 target/linux/ramips/dts/DIR-600-B1.dts        |   5 +-
 target/linux/ramips/dts/DIR-610-A1.dts        |   5 +-
 target/linux/ramips/dts/DIR-615-D.dts         |   5 +-
 target/linux/ramips/dts/DIR-615-H1.dts        |   5 +-
 target/linux/ramips/dts/DIR-620-A1.dts        |   5 +-
 target/linux/ramips/dts/DIR-620-D1.dts        |   5 +-
 target/linux/ramips/dts/DIR-645.dts           |   5 +-
 target/linux/ramips/dts/DIR-810L.dts          |   5 +-
 target/linux/ramips/dts/DIR-860L-B1.dts       |   5 +-
 target/linux/ramips/dts/DWR-116-A1.dts        |   5 +-
 target/linux/ramips/dts/DWR-118-A2.dts        |   5 +-
 target/linux/ramips/dts/DWR-512-B.dts         |   5 +-
 target/linux/ramips/dts/DWR-921-C1.dts        |   3 +-
 target/linux/ramips/dts/E1700.dts             |   5 +-
 target/linux/ramips/dts/ESR-9753.dts          |   5 +-
 target/linux/ramips/dts/EW1200.dts            |   7 +-
 target/linux/ramips/dts/EX2700.dts            |   5 +-
 target/linux/ramips/dts/EX3700.dts            |   5 +-
 target/linux/ramips/dts/F5D8235_V1.dts        |  29 ++++-
 target/linux/ramips/dts/F5D8235_V2.dts        |   7 +-
 target/linux/ramips/dts/F7C027.dts            |   5 +-
 target/linux/ramips/dts/FIREWRT.dts           |   5 +-
 target/linux/ramips/dts/FONERA20N.dts         |   7 +-
 target/linux/ramips/dts/GB-PC1.dts            |   5 +-
 target/linux/ramips/dts/GB-PC2.dts            |   5 +-
 target/linux/ramips/dts/GL-MT300N-V2.dts      |   5 +-
 target/linux/ramips/dts/HC5661.dts            |   5 +-
 target/linux/ramips/dts/HC5661A.dts           |   5 +-
 target/linux/ramips/dts/HC5761.dts            |   5 +-
 target/linux/ramips/dts/HC5861.dts            |   5 +-
 target/linux/ramips/dts/HC5861B.dts           |   5 +-
 target/linux/ramips/dts/HC5962.dts            |   5 +-
 target/linux/ramips/dts/HG255D.dts            |   7 +-
 target/linux/ramips/dts/HPM.dts               |   5 +-
 target/linux/ramips/dts/HT-TM02.dts           |   5 +-
 target/linux/ramips/dts/HW550-3G.dts          |   7 +-
 target/linux/ramips/dts/IP2202.dts            |   5 +-
 target/linux/ramips/dts/JHR-N805R.dts         |   5 +-
 target/linux/ramips/dts/JHR-N825R.dts         |   5 +-
 target/linux/ramips/dts/JHR-N926R.dts         |   5 +-
 target/linux/ramips/dts/K2G.dts               |   5 +-
 target/linux/ramips/dts/K2P.dts               |   5 +-
 target/linux/ramips/dts/LINKIT7688.dts        |   5 +-
 target/linux/ramips/dts/M2M.dts               |   5 +-
 target/linux/ramips/dts/M3.dts                |   5 +-
 target/linux/ramips/dts/M4.dtsi               |   5 +-
 target/linux/ramips/dts/MAC1200RV2.dts        |   5 +-
 target/linux/ramips/dts/MINIEMBPLUG.dts       |   2 +
 target/linux/ramips/dts/MINIEMBWIFI.dts       |   5 +-
 target/linux/ramips/dts/MIR3G.dts             |   5 +-
 target/linux/ramips/dts/MIWIFI-MINI.dts       |   5 +-
 target/linux/ramips/dts/MIWIFI-NANO.dts       |   5 +-
 target/linux/ramips/dts/MLW221.dts            |   5 +-
 target/linux/ramips/dts/MLWG2.dts             |   5 +-
 target/linux/ramips/dts/MOFI3500-3GN.dts      |   7 +-
 target/linux/ramips/dts/MPRA1.dts             |   5 +-
 target/linux/ramips/dts/MPRA2.dts             |   5 +-
 target/linux/ramips/dts/MR-102N.dts           |   7 +-
 target/linux/ramips/dts/MZK-750DHP.dts        |   5 +-
 target/linux/ramips/dts/MZK-DP150N.dts        |   5 +-
 target/linux/ramips/dts/MZK-EX300NP.dts       |   5 +-
 target/linux/ramips/dts/MZK-EX750NP.dts       |   5 +-
 target/linux/ramips/dts/MZK-W300NH2.dts       |   5 +-
 target/linux/ramips/dts/NA930.dts             |   7 +-
 target/linux/ramips/dts/NBG-419N.dts          |   5 +-
 target/linux/ramips/dts/NBG-419N2.dts         |   7 +-
 target/linux/ramips/dts/NW718.dts             |   7 +-
 target/linux/ramips/dts/Newifi-D1.dts         |   5 +-
 target/linux/ramips/dts/Newifi-D2.dts         |   7 +-
 target/linux/ramips/dts/OMEGA2.dtsi           |   5 +-
 target/linux/ramips/dts/OY-0001.dts           |   5 +-
 target/linux/ramips/dts/PBR-D1.dts            |   7 +-
 target/linux/ramips/dts/PBR-M1.dts            |   5 +-
 target/linux/ramips/dts/PSG1208.dts           |   5 +-
 target/linux/ramips/dts/PSG1218A.dts          |   5 +-
 target/linux/ramips/dts/PSG1218B.dts          |   5 +-
 target/linux/ramips/dts/PSR-680W.dts          |   5 +-
 target/linux/ramips/dts/PWH2004.dts           |   5 +-
 target/linux/ramips/dts/PX-4885.dtsi          |   7 +-
 target/linux/ramips/dts/R6120.dts             |   5 +-
 target/linux/ramips/dts/R6220.dts             |   7 +-
 target/linux/ramips/dts/RB750Gr3.dts          |   5 +-
 target/linux/ramips/dts/RBM11G.dts            |   5 +-
 target/linux/ramips/dts/RBM33G.dts            |   5 +-
 target/linux/ramips/dts/RE350.dts             |   5 +-
 target/linux/ramips/dts/RE6500.dts            |   5 +-
 target/linux/ramips/dts/RT-AC51U.dts          |   7 +-
 target/linux/ramips/dts/RT-N10-PLUS.dts       |   5 +-
 target/linux/ramips/dts/RT-N12-PLUS.dts       |   5 +-
 target/linux/ramips/dts/RT-N13U.dts           |   5 +-
 target/linux/ramips/dts/RT-N14U.dts           |   7 +-
 target/linux/ramips/dts/RT-N15.dts            |   5 +-
 target/linux/ramips/dts/RT-N56U.dts           |   5 +-
 target/linux/ramips/dts/RUT5XX.dts            |   5 +-
 target/linux/ramips/dts/SAP-G3200U3.dts       |   8 +-
 target/linux/ramips/dts/SK-WB8.dts            |   7 +-
 target/linux/ramips/dts/SL-R7205.dts          |   5 +-
 target/linux/ramips/dts/TEW-638APB-V2.dts     |   5 +-
 target/linux/ramips/dts/TEW-691GR.dts         |   5 +-
 target/linux/ramips/dts/TEW-692GR.dts         |   5 +-
 target/linux/ramips/dts/TEW-714TRU.dts        |   2 +
 target/linux/ramips/dts/TINY-AC.dts           |   2 +
 target/linux/ramips/dts/TL-MR3020V3.dts       |   7 +-
 target/linux/ramips/dts/TL-MR3420V5.dts       |   7 +-
 target/linux/ramips/dts/TL-WA801NDV5.dts      |   5 +-
 target/linux/ramips/dts/TL-WR840NV4.dts       |   5 +-
 target/linux/ramips/dts/TL-WR840NV5.dts       |   5 +-
 target/linux/ramips/dts/TL-WR841NV13.dts      |   5 +-
 target/linux/ramips/dts/TL-WR842NV5.dts       |   7 +-
 target/linux/ramips/dts/TL-WR902ACV3.dts      |   7 +-
 target/linux/ramips/dts/Timecloud.dts         |   5 +-
 target/linux/ramips/dts/U25AWF-H1.dts         |   5 +-
 target/linux/ramips/dts/U35WF.dts             |   5 +-
 target/linux/ramips/dts/U7621-06.dtsi         |   5 +-
 target/linux/ramips/dts/U7628-01.dtsi         |   7 +-
 target/linux/ramips/dts/UR-326N4G.dts         |   5 +-
 target/linux/ramips/dts/UR-336UN.dts          |   5 +-
 target/linux/ramips/dts/V11STFE.dts           |   5 +-
 target/linux/ramips/dts/V22RW-2X2.dts         |   5 +-
 target/linux/ramips/dts/VAR11N-300.dts        |   5 +-
 target/linux/ramips/dts/VOCORE.dtsi           |   5 +-
 target/linux/ramips/dts/VOCORE2.dts           |   5 +-
 target/linux/ramips/dts/VOCORE2LITE.dts       |   5 +-
 target/linux/ramips/dts/VR500.dts             |   5 +-
 target/linux/ramips/dts/W150M.dts             |   5 +-
 target/linux/ramips/dts/W2914NSV2.dts         |   2 +
 target/linux/ramips/dts/W306R_V20.dts         |   5 +-
 target/linux/ramips/dts/W502U.dts             |   7 +-
 target/linux/ramips/dts/WCR-1166DS.dts        |   5 +-
 target/linux/ramips/dts/WCR150GN.dts          |   7 +-
 target/linux/ramips/dts/WE1026-5G.dtsi        |   2 +
 target/linux/ramips/dts/WF-2881.dts           |   7 +-
 target/linux/ramips/dts/WHR-1166D.dts         |   5 +-
 target/linux/ramips/dts/WHR-300HP2.dts        |   5 +-
 target/linux/ramips/dts/WHR-600D.dts          |   5 +-
 target/linux/ramips/dts/WHR-G300N.dts         |   5 +-
 target/linux/ramips/dts/WIDORA-NEO.dtsi       |   5 +-
 target/linux/ramips/dts/WIZFI630A.dts         |   5 +-
 target/linux/ramips/dts/WL-330N.dts           |   5 +-
 target/linux/ramips/dts/WL-330N3G.dts         |   5 +-
 target/linux/ramips/dts/WL-351.dts            |   5 +-
 target/linux/ramips/dts/WLI-TX4-AG300N.dts    |   5 +-
 target/linux/ramips/dts/WLR-6000.dts          |   5 +-
 target/linux/ramips/dts/WMR-300.dts           |   5 +-
 target/linux/ramips/dts/WN-AX1167GR.dts       |   5 +-
 target/linux/ramips/dts/WN-GX300GR.dts        |   5 +-
 target/linux/ramips/dts/WN3000RPV3.dts        |   5 +-
 target/linux/ramips/dts/WNCE2001.dts          |   5 +-
 target/linux/ramips/dts/WNDR3700V5.dts        |   5 +-
 target/linux/ramips/dts/WR1200JS.dts          |   5 +-
 target/linux/ramips/dts/WR512-3GN.dtsi        |   5 +-
 target/linux/ramips/dts/WRC-1167GHBK2-S.dts   |   5 +-
 target/linux/ramips/dts/WRH-300CR.dts         |   5 +-
 target/linux/ramips/dts/WRTNODE.dts           |   5 +-
 target/linux/ramips/dts/WRTNODE2P.dts         |   5 +-
 target/linux/ramips/dts/WRTNODE2R.dts         |   5 +-
 target/linux/ramips/dts/WSR-1166.dts          |   5 +-
 target/linux/ramips/dts/WSR-600.dts           |   5 +-
 target/linux/ramips/dts/WT3020.dtsi           |   5 +-
 target/linux/ramips/dts/WZR-AGL300NH.dts      |   5 +-
 target/linux/ramips/dts/X5.dts                |   5 +-
 target/linux/ramips/dts/X8.dts                |   5 +-
 target/linux/ramips/dts/XDXRN502J.dts         |   5 +-
 target/linux/ramips/dts/Y1.dts                |   7 +-
 target/linux/ramips/dts/Y1S.dts               |   7 +-
 target/linux/ramips/dts/YOUKU-YK1.dts         |   7 +-
 target/linux/ramips/dts/ZBT-CPE102.dts        |   3 +-
 target/linux/ramips/dts/ZBT-WA05.dts          |   7 +-
 target/linux/ramips/dts/ZBT-WE1226.dts        |   5 +-
 target/linux/ramips/dts/ZBT-WE2026.dts        |   5 +-
 target/linux/ramips/dts/ZBT-WE826.dtsi        |   7 +-
 target/linux/ramips/dts/ZBT-WG2626.dts        |   5 +-
 target/linux/ramips/dts/ZBT-WG3526.dtsi       |   5 +-
 target/linux/ramips/dts/ZBT-WR8305RT.dts      |   7 +-
 target/linux/ramips/dts/ZL5900V2.dts          |   5 +-
 target/linux/ramips/dts/ZTE-Q7.dts            |   5 +-
 target/linux/ramips/dts/elecom_wrc-gst.dtsi   |   5 +-
 target/linux/ramips/dts/ki_rb.dts             |   7 +-
 target/linux/ramips/dts/kn.dts                |   7 +-
 target/linux/ramips/dts/kn_rc.dts             |   7 +-
 target/linux/ramips/dts/kn_rf.dts             |   7 +-
 target/linux/ramips/dts/kng_rc.dts            |   7 +-
 target/linux/ramips/dts/mt7620a.dtsi          |  14 +++
 target/linux/ramips/dts/mt7620n.dtsi          |  14 +++
 target/linux/ramips/dts/mt7621.dtsi           |  21 ++++
 target/linux/ramips/dts/mt7628an.dtsi         |  14 +++
 target/linux/ramips/dts/rt3050.dtsi           |   7 ++
 target/linux/ramips/dts/rt3352.dtsi           |  14 +++
 target/linux/ramips/dts/rt3883.dtsi           |  14 +++
 target/linux/ramips/dts/rt5350.dtsi           |  14 +++
 target/linux/ramips/mt7620/config-4.14        |   2 +-
 target/linux/ramips/mt7620/config-4.9         |   2 +-
 target/linux/ramips/mt76x8/config-4.14        |   1 +
 ...ci-rt2880-set-pci-controller-of_node.patch |  32 ++++++
 238 files changed, 1159 insertions(+), 329 deletions(-)
 create mode 100644 target/linux/ramips/patches-4.14/0002-MIPS-pci-rt2880-set-pci-controller-of_node.patch

diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
index 293e91ea2..5f5e5630f 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -2,10 +2,6 @@
 
 . /lib/functions/uci-defaults.sh
 
-set_usb_led() {
-	ucidef_set_led_usbdev "usb" "USB" "${1}" "${2:-1-1}"
-}
-
 set_wifi_led() {
 	ucidef_set_led_netdev "wifi_led" "wifi" "${1}" "${2:-wlan0}"
 }
@@ -17,24 +13,8 @@ boardname="${board##*,}"
 board_config_update
 
 case $board in
-11acnas|\
-all0239-3g|\
-ew1200|\
-hw550-3g|\
-mofi3500-3gn|\
-sap-g3200u3|\
-sk-wb8|\
-w2914nsv2|\
-wf-2881)
-	set_usb_led "$boardname:green:usb"
-	;;
-3g150b|\
-3g300m)
-	set_usb_led "$boardname:blue:3g"
-	;;
 3g-6200n)
 	set_wifi_led "$boardname:amber:wlan"
-	set_usb_led "$boardname:blue:3g"
 	;;
 3g-6200nl|\
 wnce2001)
@@ -50,11 +30,9 @@ ai-br100)
 	;;
 air3gii)
 	set_wifi_led "$boardname:green:wlan"
-	set_usb_led "$boardname:green:mobile"
 	;;
 alfa-network,ac1200rm)
 	set_wifi_led "$boardname:green:wlan2g" "wlan1"
-	ucidef_set_led_default "wps" "wps" "$boardname:green:wps" "0"
 	;;
 alfa-network,awusfree1)
 	set_wifi_led "$boardname:blue:wlan"
@@ -76,13 +54,8 @@ asl26555-8M|\
 asl26555-16M)
 	ucidef_set_led_netdev "eth" "ETH" "asl26555:green:eth" "eth0"
 	set_wifi_led "asl26555:green:wlan"
-	set_usb_led "asl26555:green:3g"
-	;;
-bc2)
-	set_usb_led "$boardname:blue:usb"
 	;;
 broadway)
-	set_usb_led "$boardname:red:diskmounted"
 	set_wifi_led "$boardname:red:wps_active"
 	;;
 c108)
@@ -92,13 +65,11 @@ c108)
 c20i)
 	ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e"
 	ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01"
-	set_usb_led "$boardname:blue:usb" "2-1"
 	ucidef_set_led_wlan "wlan" "wlan" "$boardname:blue:wlan" "phy0radio"
 	;;
 c50)
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e"
 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
-	set_usb_led "$boardname:green:usb"
 	ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:green:wlan2g" wlan1
 	set_wifi_led "$boardname:green:wlan5g"
 	;;
@@ -106,16 +77,8 @@ cf-wr800n)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:white:ethernet" eth0.1
 	set_wifi_led "$boardname:white:wifi"
 	;;
-cy-swr1100)
-	ucidef_set_led_default "wps" "WPS" "$boardname:blue:wps" "0"
-	set_usb_led "$boardname:blue:usb"
-	;;
-d105)
-	set_usb_led "$boardname:green:usb"
-	;;
 d240)
 	set_wifi_led "$boardname:blue:wifi"
-	set_usb_led "$boardname:blue:usb"
 	;;
 dcs-930l-b1)
 	ucidef_set_led_netdev "wifi" "WiFi" "$boardname:blue:wps"
@@ -150,20 +113,16 @@ dlink,dwr-118-a2)
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x0e"
 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
 	set_wifi_led "$boardname:green:wlan2g" "wlan1"
-	set_usb_led "$boardname:green:usb"
-	ucidef_set_led_default "internet" "internet" "$boardname:green:internet" "0"
 	;;
 dlink,dwr-921-c1)
 	set_wifi_led "$boardname:green:wifi"
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x0f"
-	ucidef_set_led_default "sigstrength" "Signal Strength" "$boardname:green:sigstrength" "0"
 	;;
 dir-860l-b1)
 	ucidef_set_led_netdev "wan" "wan" "$boardname:green:net" "eth0.2"
 	;;
 edimax,br-6478ac-v2)
 	set_wifi_led "$boardname:blue:wlan"
-	set_usb_led "$boardname:blue:usb"
 	;;
 ex2700|\
 wn3000rpv3)
@@ -174,15 +133,9 @@ ex3700)
 	ucidef_set_led_netdev "wlan2g" "DEVICE (green)" "$boardname:green:device" "wlan1"
 	;;
 f5d8235-v1)
-	ucidef_set_led_default "lan" "lan" "$boardname:blue:wired" "0"
-	set_usb_led "$boardname:blue:storage"
 	set_wifi_led "$boardname:blue:wireless"
 	;;
-f5d8235-v2)
-	set_usb_led "$boardname:blue:storage"
-	;;
 fonera20n)
-	set_usb_led "$boardname:orange:usb"
 	set_wifi_led "$boardname:orange:wifi"
 	;;
 gnubee,gb-pc1|\
@@ -215,7 +168,6 @@ hc5861)
 	;;
 hg255d)
 	set_wifi_led "$boardname:green:wlan"
-	set_usb_led "$boardname:green:usb"
 	ucidef_set_led_netdev "internet" "internet" "$boardname:green:internet" "eth0.2"
 	;;
 hiwifi,hc5861b)
@@ -235,13 +187,11 @@ kimax,u35wf)
 	;;
 kn|\
 nbg-419n2)
-	set_usb_led "$boardname:green:usb"
 	set_wifi_led "rt2800pci-phy0::radio"
 	;;
 kn_rc|\
 kn_rf|\
 kng_rc)
-	set_usb_led "$boardname:green:usb"
 	set_wifi_led "$boardname:green:wifi"
 	;;
 linkits7688)
@@ -261,7 +211,6 @@ mikrotik,rbm11g)
 	;;
 miniembplug)
 	set_wifi_led "$boardname:red:wlan"
-	set_usb_led "$boardname:green:mobile"
 	;;
 mir3g)
 	ucidef_set_led_switch "wan-amber"  "WAN (amber)"  "$boardname:amber:wan"  "switch0" "0x02" "0x08"
@@ -272,13 +221,8 @@ mlw221|\
 mlwg2)
 	set_wifi_led "$boardname:blue:wifi"
 	;;
-mpr-a1|\
-mpr-a2)
-	set_wifi_led "$boardname:blue:system"
-	;;
 mr-102n)
 	set_wifi_led "$boardname:green:wlan"
-	set_usb_led "$boardname:green:usb"
 	;;
 mr200)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:white:lan" "eth0.1"
@@ -288,28 +232,18 @@ mr200)
 mzk-ex750np)
 	set_wifi_led "$boardname:red:wifi"
 	;;
-na930)
-	set_usb_led "$boardname:blue:status"
-	;;
 netgear,r6120)
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x0f"
 	ucidef_set_led_wlan "wlan2g" "WiFi 2.4GHz" "$boardname:green:wlan2g" "phy0tpt"
 	ucidef_set_led_wlan "wlan5g" "WiFi 5GHz" "$boardname:green:wlan5g" "phy1tpt"
 	;;
-nw718)
-	set_usb_led "$boardname:amber:usb"
-	;;
 oy-0001)
 	set_wifi_led "$boardname:green:wifi"
 	;;
-pbr-d1)
-	set_usb_led "$boardname:orange:usb"
-	;;
 pbr-m1)
 	ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2"
 	;;
 d-team,newifi-d2)
-	set_usb_led "$boardname:blue:usb"
 	ucidef_set_led_switch "internet" "internet" "$boardname:amber:internet" "switch0" "0x10"
 	ucidef_set_led_netdev "wlan2g" "WiFi 2.4GHz" "$boardname:blue:wlan2g" "wlan0"
 	ucidef_set_led_netdev "wlan5g" "WiFi 5GHz" "$boardname:blue:wlan5g" "wlan1"
@@ -320,12 +254,10 @@ psg1208)
 px-4885-4M|\
 px-4885-8M)
 	set_wifi_led "px-4885:orange:wifi"
-	set_usb_led "px-4885:blue:storage"
 	;;
 r6220)
 	ucidef_set_led_netdev "wan" "wan" "$boardname:green:wan" eth0.2
 	set_wifi_led "$boardname:green:wifi"
-	set_usb_led "$boardname:green:usb"
 	;;
 re350-v1)
 	ucidef_set_led_netdev "wifi2g" "Wifi 2.4G" "$boardname:blue:wifi2G" "wlan0"
@@ -339,7 +271,6 @@ rp-n53)
 	;;
 rt-ac51u)
 	set_wifi_led "$boardname:blue:wifi"
-	set_usb_led "$boardname:blue:usb" "1-1"
 	;;
 rt-n12p)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" eth0.1
@@ -350,19 +281,16 @@ rt-n14u)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:blue:lan" eth0.1
 	ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" eth0.2
 	set_wifi_led "$boardname:blue:air"
-	set_usb_led "$boardname:blue:usb"
 	;;
 tama,w06)
 	ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0"
 	ucidef_set_led_wlan "wlan" "WLAN" "$boardname:green:wlan" "phy0tpt"
 	;;
 tew-714tru)
-	set_usb_led "$boardname:red:usb"
 	set_wifi_led "$boardname:green:wifi"
 	;;
 tiny-ac)
 	set_wifi_led "$boardname:orange:wifi"
-	set_usb_led "$boardname:green:usb"
 	;;
 tl-wr840n-v4)
 	ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt"
@@ -380,13 +308,11 @@ tl-wr841n-v13)
 tplink,c2-v1)
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch1" "0x1e"
 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch1" "0x01"
-	set_usb_led "$boardname:green:usb" "2-1"
 	set_wifi_led "$boardname:green:wlan"
 	;;
 tplink,c20-v1)
 	ucidef_set_led_switch "lan" "lan" "$boardname:blue:lan" "switch0" "0x1e"
 	ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x01"
-	set_usb_led "$boardname:blue:usb"
 	ucidef_set_led_netdev "wlan2g" "wlan2g" "$boardname:blue:wlan2g" "wlan0"
 	;;
 tplink,c20-v4)
@@ -405,19 +331,16 @@ tplink,tl-wa801nd-v5)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" "eth0"
 	;;
 tplink,tl-mr3020-v3)
-	set_usb_led "$boardname:green:3g"
 	set_wifi_led "$boardname:green:wlan"
 	ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth0"
 	;;
 tplink,tl-mr3420-v5|\
 tplink,tl-wr842n-v5)
-	set_usb_led "$boardname:green:usb"
 	ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt"
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x1e"
 	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x01"
 	;;
 tplink,tl-wr902ac-v3)
-	set_usb_led "$boardname:green:usb"
 	ucidef_set_led_wlan "wlan2g" "wlan2g" "$boardname:green:wlan" "phy0tpt"
 	ucidef_set_led_switch "lan" "lan" "$boardname:green:lan" "switch0" "0x10"
 	;;
@@ -431,31 +354,18 @@ u7628-01-128M-16M)
 	ucidef_set_led_switch "lan3" "lan3" "u7628-01:green:lan3" "switch0" "0x8"
 	ucidef_set_led_switch "lan4" "lan4" "u7628-01:green:lan4" "switch0" "0x10"
 	ucidef_set_led_switch "wan" "wan" "u7628-01:green:wan" "switch0" "0x01"
-	set_usb_led "u7628-01:green:usb"
 	set_wifi_led "u7628-01:green:wlan"
 	;;
 vocore-8M|\
 vocore-16M)
 	ucidef_set_led_netdev "eth" "ETH" "vocore:orange:eth" "eth0"
-	set_wifi_led "vocore:green:status"
-	;;
-vocore2)
-	set_wifi_led "$boardname:fuchsia:status"
-	;;
-vocore2lite)
-	set_wifi_led "$boardname:green:status"
 	;;
 w502u)
-	set_usb_led "$boardname:blue:usb"
 	set_wifi_led "rt2800pci-phy0::radio"
 	;;
-wcr-150gn)
-	set_usb_led "$boardname:amber:user"
-	;;
 we1026-5g-16m)
 	ucidef_set_led_netdev "lan" "LAN" "we1026-5g:green:lan" "eth0"
 	set_wifi_led "we1026-5g:green:wifi"
-	set_usb_led "we1026-5g:green:usb" "1-1.1"
 	;;
 wl-wn575a3)
 	ucidef_set_rssimon "wlan1" "200000" "1"
@@ -468,33 +378,25 @@ wrh-300cr)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:green:ethernet" "eth0"
 	;;
 y1)
-	set_usb_led "$boardname:blue:usb"
 	ucidef_set_led_netdev "wifi" "WIFI" "$boardname:blue:wifi" "wlan1"
 	ucidef_set_led_netdev "wifi5g" "WIFI5G" "$boardname:blue:wifi5g" "wlan0"
 	ucidef_set_led_switch "lan" "LAN" "$boardname:blue:lan" "switch0" "0x03"
 	;;
 y1s)
-	set_usb_led "$boardname:blue:usb"
 	ucidef_set_led_netdev "wifi" "WIFI" "$boardname:yellow:wifi" "wlan1"
 	ucidef_set_led_netdev "wifi5g" "WIFI5G" "$boardname:blue:wifi" "wlan0"
 	ucidef_set_led_netdev "wan" "WAN" "$boardname:blue:internet" "eth0.2" "tx rx"
 	;;
 youhua,wr1200js)
 	ucidef_set_led_switch "internet" "INTERNET" "$boardname:green:wan" "switch0" "0x01"
-	ucidef_set_led_usbdev "usb" "USB" "$boardname:blue:usb" "1-2"
-	ucidef_set_led_default "wps" "wps" "$boardname:blue:wps" "0"
 	;;
 zbt-ape522ii)
 	ucidef_set_led_netdev "wlan2g4" "wlan1-link" "$boardname:green:wlan2g4" "wlan1"
 	ucidef_set_led_netdev "sys1" "wlan1" "$boardname:green:sys1" "wlan1" "tx rx"
 	ucidef_set_led_netdev "sys2" "wlan0" "$boardname:green:sys2" "wlan0" "tx rx"
 	;;
-zbt-cpe102)
-	ucidef_set_led_default "power" "power" "$boardname:green:4g-0" "0"
-	;;
 zbt-wa05)
 	set_wifi_led "$boardname:blue:air"
-	set_usb_led "$boardname:blue:usb"
 	;;
 zbt-we2026)
 	set_wifi_led "$boardname:green:wlan"
@@ -502,7 +404,6 @@ zbt-we2026)
 zbt-we826-16M|\
 zbt-we826-32M)
 	set_wifi_led "zbt-we826:green:wifi"
-	set_usb_led "zbt-we826:green:usb"
 	;;
 zbtlink,zbt-we1226)
 	set_wifi_led "$boardname:green:wlan"
@@ -511,23 +412,17 @@ zbtlink,zbt-we1226)
 	ucidef_set_led_switch "wan" "WAN" "$boardname:green:wan" "switch0" "0x10"
 	;;
 zbt-wr8305rt)
-	set_usb_led "$boardname:green:usb"
 	set_wifi_led "$boardname:green:wifi"
 	;;
 zorlik,zl5900v2)
 	ucidef_set_led_netdev "lan" "lan" "$boardname:green:lan" eth0
 	;;
-zte-q7)
-	set_wifi_led "$boardname:blue:status"
-	;;
 zyxel,keenetic-extra-ii)
 	set_wifi_led "$boardname:green:wifi"
-	set_usb_led "$boardname:green:usb"
 	ucidef_set_led_switch "internet" "internet" "$boardname:green:internet" "switch0" "0x01"
 	;;
 youku-yk1)
 	set_wifi_led "$boardname:blue:air"
-	set_usb_led "$boardname:blue:usb"
 	ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x10"
 	;;
 esac
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
index d4318b61a..3ea7ac1a1 100644
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -1,24 +1,45 @@
 #!/bin/sh
-# Copyright (C) 2010-2013 OpenWrt.org
 
 . /lib/functions/leds.sh
 
-status_led="$(get_dt_led status)"
+boot="$(get_dt_led boot)"
+failsafe="$(get_dt_led failsafe)"
+running="$(get_dt_led running)"
+upgrade="$(get_dt_led upgrade)"
 
 set_state() {
+	status_led="$boot"
+
 	case "$1" in
 	preinit)
 		status_led_blink_preinit
 		;;
 	failsafe)
+		status_led_off
+		[ -n "$running" ] && {
+			status_led="$running"
+			status_led_off
+		}
+		status_led="$failsafe"
 		status_led_blink_failsafe
 		;;
-	upgrade | \
 	preinit_regular)
 		status_led_blink_preinit_regular
 		;;
+	upgrade)
+		[ -n "$running" ] && {
+			status_led="$running"
+			status_led_off
+		}
+		status_led="$upgrade"
+		status_led_blink_preinit_regular
+		;;
 	done)
-		status_led_on
+		status_led_off
+		[ -n "$running" ] && {
+			status_led="$running"
+			status_led_on
+		}
 		;;
 	esac
 }
diff --git a/target/linux/ramips/dts/11ACNAS.dts b/target/linux/ramips/dts/11ACNAS.dts
index f66bee636..6516bb0c1 100644
--- a/target/linux/ramips/dts/11ACNAS.dts
+++ b/target/linux/ramips/dts/11ACNAS.dts
@@ -17,6 +17,8 @@
 		usb {
 			label = "11acnas:green:usb";
 			gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/3G-6200N.dts b/target/linux/ramips/dts/3G-6200N.dts
index 88ee81dfa..0f9d4a358 100644
--- a/target/linux/ramips/dts/3G-6200N.dts
+++ b/target/linux/ramips/dts/3G-6200N.dts
@@ -10,7 +10,10 @@
 	model = "Edimax 3g-6200n";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
@@ -71,6 +74,8 @@
 		3g {
 			label = "3g-6200n:blue:3g";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/3G-6200NL.dts b/target/linux/ramips/dts/3G-6200NL.dts
index 091f9654f..78d7d6fc9 100644
--- a/target/linux/ramips/dts/3G-6200NL.dts
+++ b/target/linux/ramips/dts/3G-6200NL.dts
@@ -10,7 +10,10 @@
 	model = "Edimax 3g-6200nl";
 
 	aliases {
-		led-status = &led_internet;
+		led-boot = &led_internet;
+		led-failsafe = &led_internet;
+		led-running = &led_internet;
+		led-upgrade = &led_internet;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/3G150B.dts b/target/linux/ramips/dts/3G150B.dts
index 90a52fa8b..37362f102 100644
--- a/target/linux/ramips/dts/3G150B.dts
+++ b/target/linux/ramips/dts/3G150B.dts
@@ -10,7 +10,10 @@
 	model = "Tenda 3G150B";
 
 	aliases {
-		led-status = &led_ap;
+		led-boot = &led_ap;
+		led-failsafe = &led_ap;
+		led-running = &led_ap;
+		led-upgrade = &led_ap;
 	};
 
 	gpio-leds {
@@ -24,6 +27,8 @@
 		3g {
 			label = "3g150b:blue:3g";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/3G300M.dts b/target/linux/ramips/dts/3G300M.dts
index 8d55020e7..e98790855 100644
--- a/target/linux/ramips/dts/3G300M.dts
+++ b/target/linux/ramips/dts/3G300M.dts
@@ -10,7 +10,10 @@
 	model = "Tenda 3G300M";
 
 	aliases {
-		led-status = &led_ap;
+		led-boot = &led_ap;
+		led-failsafe = &led_ap;
+		led-running = &led_ap;
+		led-upgrade = &led_ap;
 	};
 
 	gpio-leds {
@@ -39,6 +42,8 @@
 		3g {
 			label = "3g300m:blue:3g";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wpsreset {
diff --git a/target/linux/ramips/dts/A5-V11.dts b/target/linux/ramips/dts/A5-V11.dts
index 389bd4aa3..c26be6dc8 100644
--- a/target/linux/ramips/dts/A5-V11.dts
+++ b/target/linux/ramips/dts/A5-V11.dts
@@ -10,7 +10,10 @@
 	model = "A5-V11";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/AC1200RM.dts b/target/linux/ramips/dts/AC1200RM.dts
index b2d0202ed..013554168 100644
--- a/target/linux/ramips/dts/AC1200RM.dts
+++ b/target/linux/ramips/dts/AC1200RM.dts
@@ -42,7 +42,8 @@
 	model = "ALFA Network AC1200RM";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/AI-BR100.dts b/target/linux/ramips/dts/AI-BR100.dts
index 1068179a2..866ac5ed2 100644
--- a/target/linux/ramips/dts/AI-BR100.dts
+++ b/target/linux/ramips/dts/AI-BR100.dts
@@ -10,7 +10,10 @@
 	model = "Aigale Ai-BR100";
 
 	aliases {
-		led-status = &led_wlan;
+		led-boot = &led_wlan;
+		led-failsafe = &led_wlan;
+		led-running = &led_wlan;
+		led-upgrade = &led_wlan;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/AIR3GII.dts b/target/linux/ramips/dts/AIR3GII.dts
index c3ce087ed..eb7cd0f1c 100644
--- a/target/linux/ramips/dts/AIR3GII.dts
+++ b/target/linux/ramips/dts/AIR3GII.dts
@@ -20,6 +20,8 @@
 		mobile {
 			label = "air3gii:green:mobile";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/ALL0239-3G.dts b/target/linux/ramips/dts/ALL0239-3G.dts
index 305fe6e26..3c6d86536 100644
--- a/target/linux/ramips/dts/ALL0239-3G.dts
+++ b/target/linux/ramips/dts/ALL0239-3G.dts
@@ -10,7 +10,10 @@
 	model = "Allnet ALL0239-3G";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 
@@ -56,6 +59,8 @@
 		usb {
 			label = "all0239-3g:green:usb";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		3g {
diff --git a/target/linux/ramips/dts/AR670W.dts b/target/linux/ramips/dts/AR670W.dts
index 077e447e8..3ee39c1eb 100644
--- a/target/linux/ramips/dts/AR670W.dts
+++ b/target/linux/ramips/dts/AR670W.dts
@@ -10,7 +10,10 @@
 	model = "Airlink101 AR670W";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@bdc00000 {
diff --git a/target/linux/ramips/dts/AR725W.dts b/target/linux/ramips/dts/AR725W.dts
index a99978892..6f801b88a 100644
--- a/target/linux/ramips/dts/AR725W.dts
+++ b/target/linux/ramips/dts/AR725W.dts
@@ -10,7 +10,10 @@
 	model = "Airlink101 AR725W";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@bdc00000 {
diff --git a/target/linux/ramips/dts/ASL26555.dtsi b/target/linux/ramips/dts/ASL26555.dtsi
index 890a7de18..860c2afee 100644
--- a/target/linux/ramips/dts/ASL26555.dtsi
+++ b/target/linux/ramips/dts/ASL26555.dtsi
@@ -7,7 +7,10 @@
 	compatible = "alphanetworks,asl26555", "ralink,rt3050-soc";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	gpio-keys-polled {
@@ -63,6 +66,8 @@
 		3g-green {
 			label = "asl26555:green:3g";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		3g-red {
diff --git a/target/linux/ramips/dts/ATP-52B.dts b/target/linux/ramips/dts/ATP-52B.dts
index 7f0d84732..ffe3d009a 100644
--- a/target/linux/ramips/dts/ATP-52B.dts
+++ b/target/linux/ramips/dts/ATP-52B.dts
@@ -10,7 +10,10 @@
 	model = "Argus ATP-52B";
 
 	aliases {
-		led-status = &led_run;
+		led-boot = &led_run;
+		led-failsafe = &led_run;
+		led-running = &led_run;
+		led-upgrade = &led_run;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/AWAPN2403.dts b/target/linux/ramips/dts/AWAPN2403.dts
index b9028bce0..9a4de93a2 100644
--- a/target/linux/ramips/dts/AWAPN2403.dts
+++ b/target/linux/ramips/dts/AWAPN2403.dts
@@ -10,7 +10,10 @@
 	model = "AsiaRF AWAPN2403";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 
diff --git a/target/linux/ramips/dts/AWUSFREE1.dts b/target/linux/ramips/dts/AWUSFREE1.dts
index 959f6b7db..45d8e32f7 100644
--- a/target/linux/ramips/dts/AWUSFREE1.dts
+++ b/target/linux/ramips/dts/AWUSFREE1.dts
@@ -42,7 +42,10 @@
 	model = "ALFA Network AWUSFREE1";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/ArcherC2-v1.dts b/target/linux/ramips/dts/ArcherC2-v1.dts
index cc0d46a6b..462daf371 100644
--- a/target/linux/ramips/dts/ArcherC2-v1.dts
+++ b/target/linux/ramips/dts/ArcherC2-v1.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link Archer C2 v1";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	chosen {
@@ -37,6 +40,8 @@
 		usb {
 			label = "c2-v1:green:usb";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		led_wps: wps {
diff --git a/target/linux/ramips/dts/ArcherC20i.dts b/target/linux/ramips/dts/ArcherC20i.dts
index edaa76e3d..b44c161fa 100644
--- a/target/linux/ramips/dts/ArcherC20i.dts
+++ b/target/linux/ramips/dts/ArcherC20i.dts
@@ -22,6 +22,8 @@
 		usb {
 			label = "c20i:blue:usb";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 		wps {
 			label = "c20i:blue:wps";
diff --git a/target/linux/ramips/dts/ArcherC20v1.dts b/target/linux/ramips/dts/ArcherC20v1.dts
index 70c6f8430..90fa2a26e 100644
--- a/target/linux/ramips/dts/ArcherC20v1.dts
+++ b/target/linux/ramips/dts/ArcherC20v1.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link Archer C20 v1";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -34,6 +37,8 @@
 		usb {
 			label = "c20-v1:blue:usb";
 			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wan {
diff --git a/target/linux/ramips/dts/ArcherC20v4.dts b/target/linux/ramips/dts/ArcherC20v4.dts
index 49f9dc9a0..f0ae2beba 100644
--- a/target/linux/ramips/dts/ArcherC20v4.dts
+++ b/target/linux/ramips/dts/ArcherC20v4.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link Archer C20 v4";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/ArcherC50.dts b/target/linux/ramips/dts/ArcherC50.dts
index efcb17094..0524bfc5b 100644
--- a/target/linux/ramips/dts/ArcherC50.dts
+++ b/target/linux/ramips/dts/ArcherC50.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link Archer C50";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -34,6 +37,8 @@
 		usb {
 			label = "c50:green:usb";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wan {
diff --git a/target/linux/ramips/dts/ArcherC50V3.dts b/target/linux/ramips/dts/ArcherC50V3.dts
index 397dc22bb..423ac88c2 100644
--- a/target/linux/ramips/dts/ArcherC50V3.dts
+++ b/target/linux/ramips/dts/ArcherC50V3.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link Archer C50 v3";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/ArcherMR200.dts b/target/linux/ramips/dts/ArcherMR200.dts
index 2735d7406..1df35e6f3 100644
--- a/target/linux/ramips/dts/ArcherMR200.dts
+++ b/target/linux/ramips/dts/ArcherMR200.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link Archer MR200";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/BC2.dts b/target/linux/ramips/dts/BC2.dts
index c57e79e53..1143497b6 100644
--- a/target/linux/ramips/dts/BC2.dts
+++ b/target/linux/ramips/dts/BC2.dts
@@ -51,6 +51,8 @@
 		usb {
 			label = "bc2:blue:usb";
 			gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/BR-6475ND.dts b/target/linux/ramips/dts/BR-6475ND.dts
index 3f260fe06..cf1d2ff95 100644
--- a/target/linux/ramips/dts/BR-6475ND.dts
+++ b/target/linux/ramips/dts/BR-6475ND.dts
@@ -10,7 +10,10 @@
 	model = "Edimax BR-6475nD";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/BR-6478AC-V2.dts b/target/linux/ramips/dts/BR-6478AC-V2.dts
index b38be1e2c..03a853d9f 100644
--- a/target/linux/ramips/dts/BR-6478AC-V2.dts
+++ b/target/linux/ramips/dts/BR-6478AC-V2.dts
@@ -23,7 +23,10 @@
 	model = "Edimax BR-6478AC v2";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -59,6 +62,8 @@
 		usb {
 			label = "br-6478ac-v2:blue:usb";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/BROADWAY.dts b/target/linux/ramips/dts/BROADWAY.dts
index a5664fe79..b3382cd16 100644
--- a/target/linux/ramips/dts/BROADWAY.dts
+++ b/target/linux/ramips/dts/BROADWAY.dts
@@ -51,6 +51,8 @@
 		diskmounted {
 			label = "broadway:red:diskmounted";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wps_active {
diff --git a/target/linux/ramips/dts/C108.dts b/target/linux/ramips/dts/C108.dts
index b30addf28..c4fa62d8a 100644
--- a/target/linux/ramips/dts/C108.dts
+++ b/target/linux/ramips/dts/C108.dts
@@ -43,7 +43,10 @@
 	model = "HNET C108";
 
 	aliases {
-		led-status = &led_lan_green;
+		led-boot = &led_lan_green;
+		led-failsafe = &led_lan_green;
+		led-running = &led_lan_green;
+		led-upgrade = &led_lan_green;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/CF-WR800N.dts b/target/linux/ramips/dts/CF-WR800N.dts
index 8c5778527..d3d104af8 100644
--- a/target/linux/ramips/dts/CF-WR800N.dts
+++ b/target/linux/ramips/dts/CF-WR800N.dts
@@ -10,7 +10,10 @@
 	model = "Comfast CF-WR800N";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/CS-QR10.dts b/target/linux/ramips/dts/CS-QR10.dts
index c81629f42..fc4803fbf 100644
--- a/target/linux/ramips/dts/CS-QR10.dts
+++ b/target/linux/ramips/dts/CS-QR10.dts
@@ -10,7 +10,10 @@
 	model = "Planex CS-QR10";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/CY-SWR1100.dts b/target/linux/ramips/dts/CY-SWR1100.dts
index 787667a6e..2d948b032 100644
--- a/target/linux/ramips/dts/CY-SWR1100.dts
+++ b/target/linux/ramips/dts/CY-SWR1100.dts
@@ -10,7 +10,8 @@
 	model = "Samsung CY-SWR1100";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
 	};
 
 	nor-flash@1c000000 {
@@ -94,6 +95,8 @@
 		usb {
 			label = "cy-swr1100:blue:usb";
 			gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/D105.dts b/target/linux/ramips/dts/D105.dts
index 89cde124b..80746c0f6 100644
--- a/target/linux/ramips/dts/D105.dts
+++ b/target/linux/ramips/dts/D105.dts
@@ -10,7 +10,10 @@
 	model = "Huawei D105";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
@@ -60,6 +63,8 @@
 		usb {
 			label = "d105:green:usb";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/D240.dts b/target/linux/ramips/dts/D240.dts
index 613a20f99..134ebdda5 100644
--- a/target/linux/ramips/dts/D240.dts
+++ b/target/linux/ramips/dts/D240.dts
@@ -43,7 +43,10 @@
 	model = "Sanlinking Technologies D240";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -78,6 +81,8 @@
 		usb {
 			label = "d240:blue:usb";
 			gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		air {
diff --git a/target/linux/ramips/dts/DAP-1350.dts b/target/linux/ramips/dts/DAP-1350.dts
index cd6d07f4a..0359437bd 100644
--- a/target/linux/ramips/dts/DAP-1350.dts
+++ b/target/linux/ramips/dts/DAP-1350.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DAP-1350";
 
 	aliases {
-		led-status = &led_power_blue;
+		led-boot = &led_power_blue;
+		led-failsafe = &led_power_blue;
+		led-running = &led_power_blue;
+		led-upgrade = &led_power_blue;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/DAP-1522-A1.dts b/target/linux/ramips/dts/DAP-1522-A1.dts
index 11efb5bbf..bdd63ea96 100644
--- a/target/linux/ramips/dts/DAP-1522-A1.dts
+++ b/target/linux/ramips/dts/DAP-1522-A1.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DAP-1522 A1";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	cfi@bc400000 {
diff --git a/target/linux/ramips/dts/DB-WRT01.dts b/target/linux/ramips/dts/DB-WRT01.dts
index e25b2f0d6..0c7e3b9f5 100644
--- a/target/linux/ramips/dts/DB-WRT01.dts
+++ b/target/linux/ramips/dts/DB-WRT01.dts
@@ -10,7 +10,10 @@
 	model = "Planex DB-WRT01";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/DCH-M225.dts b/target/linux/ramips/dts/DCH-M225.dts
index b21843692..93a285e88 100644
--- a/target/linux/ramips/dts/DCH-M225.dts
+++ b/target/linux/ramips/dts/DCH-M225.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DCH-M225";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/DCS-930.dts b/target/linux/ramips/dts/DCS-930.dts
index 3c9c3d39f..949eea64e 100644
--- a/target/linux/ramips/dts/DCS-930.dts
+++ b/target/linux/ramips/dts/DCS-930.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DCS-930";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/DCS-930L-B1.dts b/target/linux/ramips/dts/DCS-930L-B1.dts
index 8ec52457f..9c4941c6c 100644
--- a/target/linux/ramips/dts/DCS-930L-B1.dts
+++ b/target/linux/ramips/dts/DCS-930L-B1.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DCS-930L B1";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/DIR-300-B1.dts b/target/linux/ramips/dts/DIR-300-B1.dts
index 515b29bf0..f64e781ee 100644
--- a/target/linux/ramips/dts/DIR-300-B1.dts
+++ b/target/linux/ramips/dts/DIR-300-B1.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-300 B1";
 
 	aliases {
-		led-status = &led_status_green;
+		led-boot = &led_status_green;
+		led-failsafe = &led_status_green;
+		led-running = &led_status_green;
+		led-upgrade = &led_status_green;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/DIR-300-B7.dts b/target/linux/ramips/dts/DIR-300-B7.dts
index f6a858250..6f9a8fabb 100644
--- a/target/linux/ramips/dts/DIR-300-B7.dts
+++ b/target/linux/ramips/dts/DIR-300-B7.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-300 B7";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/DIR-320-B1.dts b/target/linux/ramips/dts/DIR-320-B1.dts
index 36c23de08..3b1f17509 100644
--- a/target/linux/ramips/dts/DIR-320-B1.dts
+++ b/target/linux/ramips/dts/DIR-320-B1.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-320 B1";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/DIR-600-B1.dts b/target/linux/ramips/dts/DIR-600-B1.dts
index 541b5cece..9e9dc668f 100644
--- a/target/linux/ramips/dts/DIR-600-B1.dts
+++ b/target/linux/ramips/dts/DIR-600-B1.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-600 B1";
 
 	aliases {
-		led-status = &led_status_green;
+		led-boot = &led_status_green;
+		led-failsafe = &led_status_green;
+		led-running = &led_status_green;
+		led-upgrade = &led_status_green;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/DIR-610-A1.dts b/target/linux/ramips/dts/DIR-610-A1.dts
index 445fd2885..9af52123e 100644
--- a/target/linux/ramips/dts/DIR-610-A1.dts
+++ b/target/linux/ramips/dts/DIR-610-A1.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-610 A1";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/DIR-615-D.dts b/target/linux/ramips/dts/DIR-615-D.dts
index b59ff3c7c..ba4933175 100644
--- a/target/linux/ramips/dts/DIR-615-D.dts
+++ b/target/linux/ramips/dts/DIR-615-D.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-615 D";
 
 	aliases {
-		led-status = &led_status_green;
+		led-boot = &led_status_green;
+		led-failsafe = &led_status_green;
+		led-running = &led_status_green;
+		led-upgrade = &led_status_green;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/DIR-615-H1.dts b/target/linux/ramips/dts/DIR-615-H1.dts
index cbc3dadb7..6d8f6a2be 100644
--- a/target/linux/ramips/dts/DIR-615-H1.dts
+++ b/target/linux/ramips/dts/DIR-615-H1.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-615 H1";
 
 	aliases {
-		led-status = &led_status_green;
+		led-boot = &led_status_green;
+		led-failsafe = &led_status_green;
+		led-running = &led_status_green;
+		led-upgrade = &led_status_green;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/DIR-620-A1.dts b/target/linux/ramips/dts/DIR-620-A1.dts
index fdf68b58f..d42dfa81a 100644
--- a/target/linux/ramips/dts/DIR-620-A1.dts
+++ b/target/linux/ramips/dts/DIR-620-A1.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-620 A1";
 
 	aliases {
-		led-status = &led_status_green;
+		led-boot = &led_status_green;
+		led-failsafe = &led_status_green;
+		led-running = &led_status_green;
+		led-upgrade = &led_status_green;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/DIR-620-D1.dts b/target/linux/ramips/dts/DIR-620-D1.dts
index e0b2f78c7..5358a0510 100644
--- a/target/linux/ramips/dts/DIR-620-D1.dts
+++ b/target/linux/ramips/dts/DIR-620-D1.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-620 D1";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/DIR-645.dts b/target/linux/ramips/dts/DIR-645.dts
index 1728cb25c..74cdacd25 100644
--- a/target/linux/ramips/dts/DIR-645.dts
+++ b/target/linux/ramips/dts/DIR-645.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-645";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	rtl8367b {
diff --git a/target/linux/ramips/dts/DIR-810L.dts b/target/linux/ramips/dts/DIR-810L.dts
index 2121a2172..b38290af5 100644
--- a/target/linux/ramips/dts/DIR-810L.dts
+++ b/target/linux/ramips/dts/DIR-810L.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-810L";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/DIR-860L-B1.dts b/target/linux/ramips/dts/DIR-860L-B1.dts
index b1eeb117a..0f4f2ed8f 100644
--- a/target/linux/ramips/dts/DIR-860L-B1.dts
+++ b/target/linux/ramips/dts/DIR-860L-B1.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DIR-860L B1";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/DWR-116-A1.dts b/target/linux/ramips/dts/DWR-116-A1.dts
index bbafadd36..0ee990de6 100644
--- a/target/linux/ramips/dts/DWR-116-A1.dts
+++ b/target/linux/ramips/dts/DWR-116-A1.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DWR-116 A1/A2";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/DWR-118-A2.dts b/target/linux/ramips/dts/DWR-118-A2.dts
index fd8f93241..d53073e25 100644
--- a/target/linux/ramips/dts/DWR-118-A2.dts
+++ b/target/linux/ramips/dts/DWR-118-A2.dts
@@ -10,7 +10,8 @@
 	model = "D-Link DWR-118 A2";
 
 	aliases {
-		led-status = &led_internet;
+		led-boot = &led_internet;
+		led-failsafe = &led_internet;
 	};
 
 	gpio-keys-polled {
@@ -56,6 +57,8 @@
 		usb {
 			label = "dwr-118-a2:green:usb";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/DWR-512-B.dts b/target/linux/ramips/dts/DWR-512-B.dts
index 6860e9dfd..04fa08f0a 100644
--- a/target/linux/ramips/dts/DWR-512-B.dts
+++ b/target/linux/ramips/dts/DWR-512-B.dts
@@ -10,7 +10,10 @@
 	model = "D-Link DWR-512 B";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/DWR-921-C1.dts b/target/linux/ramips/dts/DWR-921-C1.dts
index b94ce95bb..c4a337382 100644
--- a/target/linux/ramips/dts/DWR-921-C1.dts
+++ b/target/linux/ramips/dts/DWR-921-C1.dts
@@ -10,7 +10,8 @@
 	model = "D-Link DWR-921 C1";
 
 	aliases {
-		led-status = &led_sstrenghg;
+		led-boot = &led_sstrenghg;
+		led-failsafe = &led_sstrenghg;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/E1700.dts b/target/linux/ramips/dts/E1700.dts
index 75e1e0782..bdaa4d7fa 100644
--- a/target/linux/ramips/dts/E1700.dts
+++ b/target/linux/ramips/dts/E1700.dts
@@ -20,7 +20,10 @@
 	model = "Linksys E1700";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/ESR-9753.dts b/target/linux/ramips/dts/ESR-9753.dts
index 590727370..a41bcf5c8 100644
--- a/target/linux/ramips/dts/ESR-9753.dts
+++ b/target/linux/ramips/dts/ESR-9753.dts
@@ -10,7 +10,10 @@
 	model = "Senao / EnGenius ESR-9753";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/EW1200.dts b/target/linux/ramips/dts/EW1200.dts
index b7b15137e..b95e2aadd 100644
--- a/target/linux/ramips/dts/EW1200.dts
+++ b/target/linux/ramips/dts/EW1200.dts
@@ -10,7 +10,10 @@
 	model = "EW1200";
 
 	aliases {
-		led-status = &led_run;
+		led-boot = &led_run;
+		led-failsafe = &led_run;
+		led-running = &led_run;
+		led-upgrade = &led_run;
 	};
 
 	memory@0 {
@@ -50,6 +53,8 @@
 		usb {
 			label = "ew1200:green:usb";
 			gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/EX2700.dts b/target/linux/ramips/dts/EX2700.dts
index fd0def609..658543e0f 100644
--- a/target/linux/ramips/dts/EX2700.dts
+++ b/target/linux/ramips/dts/EX2700.dts
@@ -20,7 +20,10 @@
 	model = "Netgear EX2700";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/EX3700.dts b/target/linux/ramips/dts/EX3700.dts
index 2f284e9ac..392b4968a 100644
--- a/target/linux/ramips/dts/EX3700.dts
+++ b/target/linux/ramips/dts/EX3700.dts
@@ -12,7 +12,10 @@
 	model = "Netgear EX3700/EX3800";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/F5D8235_V1.dts b/target/linux/ramips/dts/F5D8235_V1.dts
index f588c9fb2..a8c991049 100644
--- a/target/linux/ramips/dts/F5D8235_V1.dts
+++ b/target/linux/ramips/dts/F5D8235_V1.dts
@@ -12,7 +12,8 @@
 	model = "Belkin F5D8235 v1";
 
 	aliases {
-		led-status = &led_wired_blue;
+		led-boot = &led_wired_blue;
+		led-failsafe = &led_wired_blue;
 	};
 
 	cfi@1f000000 {
@@ -146,6 +147,8 @@
 		storage {
 			label = "f5d8235-v1:blue:storage";
 			gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		storage2 {
@@ -209,6 +212,30 @@
 
 &pci {
 	status = "okay";
+
+	usb@11,0 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "pci1033,0035";
+		reg = <0x8800 0 0 0 0>;
+
+		ohci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
+	};
+
+	usb@11,1 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "pci1033,00e0";
+		reg = <0x8900 0 0 0 0>;
+
+		ehci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
+	};
 };
 
 &wmac {
diff --git a/target/linux/ramips/dts/F5D8235_V2.dts b/target/linux/ramips/dts/F5D8235_V2.dts
index f075dff49..a3a125594 100644
--- a/target/linux/ramips/dts/F5D8235_V2.dts
+++ b/target/linux/ramips/dts/F5D8235_V2.dts
@@ -10,7 +10,10 @@
 	model = "Belkin F5D8235 v2";
 
 	aliases {
-		led-status = &led_router;
+		led-boot = &led_router;
+		led-failsafe = &led_router;
+		led-running = &led_router;
+		led-upgrade = &led_router;
 	};
 
 	cfi@1f000000 {
@@ -84,6 +87,8 @@
 		storage {
 			label = "f5d8235-v2:blue:storage";
 			gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		storage2 {
diff --git a/target/linux/ramips/dts/F7C027.dts b/target/linux/ramips/dts/F7C027.dts
index e97f8b4f4..03587f2ff 100644
--- a/target/linux/ramips/dts/F7C027.dts
+++ b/target/linux/ramips/dts/F7C027.dts
@@ -10,7 +10,10 @@
 	model = "Belkin F7C027";
 
 	aliases {
-		led-status = &led_status_orange;
+		led-boot = &led_status_orange;
+		led-failsafe = &led_status_orange;
+		led-running = &led_status_orange;
+		led-upgrade = &led_status_orange;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/FIREWRT.dts b/target/linux/ramips/dts/FIREWRT.dts
index 077c61286..cb853031b 100644
--- a/target/linux/ramips/dts/FIREWRT.dts
+++ b/target/linux/ramips/dts/FIREWRT.dts
@@ -10,7 +10,10 @@
 	model = "Firefly FireWRT";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/FONERA20N.dts b/target/linux/ramips/dts/FONERA20N.dts
index 17bf4a83f..45949a841 100644
--- a/target/linux/ramips/dts/FONERA20N.dts
+++ b/target/linux/ramips/dts/FONERA20N.dts
@@ -10,7 +10,10 @@
 	model = "La Fonera 2.0N";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
@@ -65,6 +68,8 @@
 		usb {
 			label = "fonera20n:orange:usb";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/GB-PC1.dts b/target/linux/ramips/dts/GB-PC1.dts
index 996d7c8b5..49262cc6a 100644
--- a/target/linux/ramips/dts/GB-PC1.dts
+++ b/target/linux/ramips/dts/GB-PC1.dts
@@ -10,7 +10,10 @@
 	model = "GB-PC1";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/GB-PC2.dts b/target/linux/ramips/dts/GB-PC2.dts
index 1e7f3b2ea..9049e7387 100644
--- a/target/linux/ramips/dts/GB-PC2.dts
+++ b/target/linux/ramips/dts/GB-PC2.dts
@@ -10,7 +10,10 @@
 	model = "GB-PC2";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/GL-MT300N-V2.dts b/target/linux/ramips/dts/GL-MT300N-V2.dts
index b41a9ae66..48c43baef 100644
--- a/target/linux/ramips/dts/GL-MT300N-V2.dts
+++ b/target/linux/ramips/dts/GL-MT300N-V2.dts
@@ -10,7 +10,10 @@
 	model = "GL-MT300N-V2";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/HC5661.dts b/target/linux/ramips/dts/HC5661.dts
index c7d6039a0..f07070510 100644
--- a/target/linux/ramips/dts/HC5661.dts
+++ b/target/linux/ramips/dts/HC5661.dts
@@ -7,7 +7,10 @@
 	model = "HiWiFi HC5661";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/HC5661A.dts b/target/linux/ramips/dts/HC5661A.dts
index 7541677ab..a6eaade06 100644
--- a/target/linux/ramips/dts/HC5661A.dts
+++ b/target/linux/ramips/dts/HC5661A.dts
@@ -10,7 +10,10 @@
 	model = "HiWiFi HC5661A";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/HC5761.dts b/target/linux/ramips/dts/HC5761.dts
index 64b6d27af..31a5aa760 100644
--- a/target/linux/ramips/dts/HC5761.dts
+++ b/target/linux/ramips/dts/HC5761.dts
@@ -7,7 +7,10 @@
 	model = "HiWiFi HC5761";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/HC5861.dts b/target/linux/ramips/dts/HC5861.dts
index d6049fd8e..371f8db21 100644
--- a/target/linux/ramips/dts/HC5861.dts
+++ b/target/linux/ramips/dts/HC5861.dts
@@ -7,7 +7,10 @@
 	model = "HiWiFi HC5861";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/HC5861B.dts b/target/linux/ramips/dts/HC5861B.dts
index e4a4cce81..ba9ab1c06 100644
--- a/target/linux/ramips/dts/HC5861B.dts
+++ b/target/linux/ramips/dts/HC5861B.dts
@@ -10,7 +10,10 @@
 	model = "HiWiFi HC5861B";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/HC5962.dts b/target/linux/ramips/dts/HC5962.dts
index 1bad7e6a1..298502046 100644
--- a/target/linux/ramips/dts/HC5962.dts
+++ b/target/linux/ramips/dts/HC5962.dts
@@ -10,7 +10,10 @@
 	model = "HiWiFi HC5962";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/HG255D.dts b/target/linux/ramips/dts/HG255D.dts
index 0e4ad421e..56fb9492b 100644
--- a/target/linux/ramips/dts/HG255D.dts
+++ b/target/linux/ramips/dts/HG255D.dts
@@ -10,7 +10,10 @@
 	model = "HuaWei HG255D";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
@@ -76,6 +79,8 @@
 		usb {
 			label = "hg255d:green:usb";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wps {
diff --git a/target/linux/ramips/dts/HPM.dts b/target/linux/ramips/dts/HPM.dts
index 9d50697d8..77a3f3bae 100644
--- a/target/linux/ramips/dts/HPM.dts
+++ b/target/linux/ramips/dts/HPM.dts
@@ -10,7 +10,10 @@
 	model = "Omnima HPM";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/HT-TM02.dts b/target/linux/ramips/dts/HT-TM02.dts
index d75d19ef4..9eeeb934e 100644
--- a/target/linux/ramips/dts/HT-TM02.dts
+++ b/target/linux/ramips/dts/HT-TM02.dts
@@ -10,7 +10,10 @@
 	model = "HooToo HT-TM02";
 
 	aliases {
-		led-status = &led_wlan;
+		led-boot = &led_wlan;
+		led-failsafe = &led_wlan;
+		led-running = &led_wlan;
+		led-upgrade = &led_wlan;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/HW550-3G.dts b/target/linux/ramips/dts/HW550-3G.dts
index 1b589b5f6..501d0828d 100644
--- a/target/linux/ramips/dts/HW550-3G.dts
+++ b/target/linux/ramips/dts/HW550-3G.dts
@@ -10,7 +10,10 @@
 	model = "Aztech HW550-3G";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	cfi@1f000000 {
@@ -55,6 +58,8 @@
 		usb {
 			label = "hw550-3g:green:usb";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		3g {
diff --git a/target/linux/ramips/dts/IP2202.dts b/target/linux/ramips/dts/IP2202.dts
index ed4e5a972..7275dfa1f 100644
--- a/target/linux/ramips/dts/IP2202.dts
+++ b/target/linux/ramips/dts/IP2202.dts
@@ -10,7 +10,10 @@
 	model = "Poray IP2202";
 
 	aliases {
-		led-status = &led_run;
+		led-boot = &led_run;
+		led-failsafe = &led_run;
+		led-running = &led_run;
+		led-upgrade = &led_run;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/JHR-N805R.dts b/target/linux/ramips/dts/JHR-N805R.dts
index f5a084048..f637543c8 100644
--- a/target/linux/ramips/dts/JHR-N805R.dts
+++ b/target/linux/ramips/dts/JHR-N805R.dts
@@ -10,7 +10,10 @@
 	model = "JCG JHR-N805R";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/JHR-N825R.dts b/target/linux/ramips/dts/JHR-N825R.dts
index d04b20288..6338f5306 100644
--- a/target/linux/ramips/dts/JHR-N825R.dts
+++ b/target/linux/ramips/dts/JHR-N825R.dts
@@ -10,7 +10,10 @@
 	model = "JCG JHR-N825R";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/JHR-N926R.dts b/target/linux/ramips/dts/JHR-N926R.dts
index 9e043ddc1..c9da0138c 100644
--- a/target/linux/ramips/dts/JHR-N926R.dts
+++ b/target/linux/ramips/dts/JHR-N926R.dts
@@ -10,7 +10,10 @@
 	model = "JCG JHR-N926R";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/K2G.dts b/target/linux/ramips/dts/K2G.dts
index 891b08998..f8ccad10b 100644
--- a/target/linux/ramips/dts/K2G.dts
+++ b/target/linux/ramips/dts/K2G.dts
@@ -10,7 +10,10 @@
 	model = "Phicomm K2G";
 
 	aliases {
-		led-status = &led_blue;
+		led-boot = &led_blue;
+		led-failsafe = &led_blue;
+		led-running = &led_blue;
+		led-upgrade = &led_blue;
 		serial0 = &uartlite;
 	};
 
diff --git a/target/linux/ramips/dts/K2P.dts b/target/linux/ramips/dts/K2P.dts
index 50d29edbe..397fc29b6 100644
--- a/target/linux/ramips/dts/K2P.dts
+++ b/target/linux/ramips/dts/K2P.dts
@@ -10,7 +10,10 @@
 	model = "Phicomm K2P";
 
 	aliases {
-		led-status = &led_blue;
+		led-boot = &led_blue;
+		led-failsafe = &led_blue;
+		led-running = &led_blue;
+		led-upgrade = &led_blue;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/LINKIT7688.dts b/target/linux/ramips/dts/LINKIT7688.dts
index 600f1b46a..5313e9b52 100644
--- a/target/linux/ramips/dts/LINKIT7688.dts
+++ b/target/linux/ramips/dts/LINKIT7688.dts
@@ -10,7 +10,10 @@
 	model = "MediaTek LinkIt Smart 7688";
 
 	aliases {
-		led-status = &led_wifi;
+		led-boot = &led_wifi;
+		led-failsafe = &led_wifi;
+		led-running = &led_wifi;
+		led-upgrade = &led_wifi;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/M2M.dts b/target/linux/ramips/dts/M2M.dts
index 2e9092a4b..5507cee75 100644
--- a/target/linux/ramips/dts/M2M.dts
+++ b/target/linux/ramips/dts/M2M.dts
@@ -10,7 +10,10 @@
 	model = "Intenso Memory 2 Move";
 
 	aliases {
-		led-status = &led_wifi;
+		led-boot = &led_wifi;
+		led-failsafe = &led_wifi;
+		led-running = &led_wifi;
+		led-upgrade = &led_wifi;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/M3.dts b/target/linux/ramips/dts/M3.dts
index 43b1cbf83..1a4385b2b 100644
--- a/target/linux/ramips/dts/M3.dts
+++ b/target/linux/ramips/dts/M3.dts
@@ -10,7 +10,10 @@
 	model = "Poray M3";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/M4.dtsi b/target/linux/ramips/dts/M4.dtsi
index e56ea8261..8a9548ef4 100644
--- a/target/linux/ramips/dts/M4.dtsi
+++ b/target/linux/ramips/dts/M4.dtsi
@@ -7,7 +7,10 @@
 	compatible = "poray,m4", "ralink,rt5350-soc";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/MAC1200RV2.dts b/target/linux/ramips/dts/MAC1200RV2.dts
index 3e2b60268..73cba5293 100644
--- a/target/linux/ramips/dts/MAC1200RV2.dts
+++ b/target/linux/ramips/dts/MAC1200RV2.dts
@@ -10,7 +10,10 @@
 	model = "Mercury MAC1200R v2";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/MINIEMBPLUG.dts b/target/linux/ramips/dts/MINIEMBPLUG.dts
index 94d6b410f..00d057d29 100644
--- a/target/linux/ramips/dts/MINIEMBPLUG.dts
+++ b/target/linux/ramips/dts/MINIEMBPLUG.dts
@@ -20,6 +20,8 @@
 		mobile {
 			label = "miniembplug:green:mobile";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/MINIEMBWIFI.dts b/target/linux/ramips/dts/MINIEMBWIFI.dts
index 754e92e24..e8b26c68f 100644
--- a/target/linux/ramips/dts/MINIEMBWIFI.dts
+++ b/target/linux/ramips/dts/MINIEMBWIFI.dts
@@ -10,7 +10,10 @@
 	model = "Omnima MiniEMBWiFi";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/MIR3G.dts b/target/linux/ramips/dts/MIR3G.dts
index ab49acfb3..40bcf884f 100644
--- a/target/linux/ramips/dts/MIR3G.dts
+++ b/target/linux/ramips/dts/MIR3G.dts
@@ -10,7 +10,10 @@
 	model = "Xiaomi Mi Router 3G";
 
 	aliases {
-		led-status = &led_status_blue;
+		led-boot = &led_status_blue;
+		led-failsafe = &led_status_blue;
+		led-running = &led_status_blue;
+		led-upgrade = &led_status_blue;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/MIWIFI-MINI.dts b/target/linux/ramips/dts/MIWIFI-MINI.dts
index 89a688bfe..a6c20f3fc 100644
--- a/target/linux/ramips/dts/MIWIFI-MINI.dts
+++ b/target/linux/ramips/dts/MIWIFI-MINI.dts
@@ -10,7 +10,10 @@
 	model = "Xiaomi MiWiFi Mini";
 
 	aliases {
-		led-status = &led_blue;
+		led-boot = &led_blue;
+		led-failsafe = &led_blue;
+		led-running = &led_blue;
+		led-upgrade = &led_blue;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/MIWIFI-NANO.dts b/target/linux/ramips/dts/MIWIFI-NANO.dts
index 823132cfa..7517d2191 100644
--- a/target/linux/ramips/dts/MIWIFI-NANO.dts
+++ b/target/linux/ramips/dts/MIWIFI-NANO.dts
@@ -10,7 +10,10 @@
 	model = "MiWiFi Nano";
 
 	aliases {
-		led-status = &led_blue;
+		led-boot = &led_blue;
+		led-failsafe = &led_blue;
+		led-running = &led_blue;
+		led-upgrade = &led_blue;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/MLW221.dts b/target/linux/ramips/dts/MLW221.dts
index f6567dc9e..94c12026c 100644
--- a/target/linux/ramips/dts/MLW221.dts
+++ b/target/linux/ramips/dts/MLW221.dts
@@ -10,7 +10,10 @@
 	model = "Kingston MLW221";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/MLWG2.dts b/target/linux/ramips/dts/MLWG2.dts
index 9c05b59d1..243c7a538 100644
--- a/target/linux/ramips/dts/MLWG2.dts
+++ b/target/linux/ramips/dts/MLWG2.dts
@@ -10,7 +10,10 @@
 	model = "Kingston MLWG2";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/MOFI3500-3GN.dts b/target/linux/ramips/dts/MOFI3500-3GN.dts
index 345c028d0..042be7ebd 100644
--- a/target/linux/ramips/dts/MOFI3500-3GN.dts
+++ b/target/linux/ramips/dts/MOFI3500-3GN.dts
@@ -10,7 +10,10 @@
 	model = "MoFi Network MOFI3500-3GN";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	cfi@1f000000 {
@@ -55,6 +58,8 @@
 		usb {
 			label = "mofi3500-3gn:green:usb";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		3g {
diff --git a/target/linux/ramips/dts/MPRA1.dts b/target/linux/ramips/dts/MPRA1.dts
index 22e2010e2..7584b85fb 100644
--- a/target/linux/ramips/dts/MPRA1.dts
+++ b/target/linux/ramips/dts/MPRA1.dts
@@ -10,7 +10,10 @@
 	model = "HAME MPR-A1";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/MPRA2.dts b/target/linux/ramips/dts/MPRA2.dts
index 7c8cdd2eb..e6b427621 100644
--- a/target/linux/ramips/dts/MPRA2.dts
+++ b/target/linux/ramips/dts/MPRA2.dts
@@ -10,7 +10,10 @@
 	model = "HAME MPR-A2";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/MR-102N.dts b/target/linux/ramips/dts/MR-102N.dts
index c278b9cb9..824728007 100644
--- a/target/linux/ramips/dts/MR-102N.dts
+++ b/target/linux/ramips/dts/MR-102N.dts
@@ -10,7 +10,10 @@
 	model = "AXIMCom MR-102N";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	cfi@1f000000 {
@@ -65,6 +68,8 @@
 		usb {
 			label = "mr-102n:green:usb";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		led_status: status {
diff --git a/target/linux/ramips/dts/MZK-750DHP.dts b/target/linux/ramips/dts/MZK-750DHP.dts
index 9ca7efb98..e982d51e3 100644
--- a/target/linux/ramips/dts/MZK-750DHP.dts
+++ b/target/linux/ramips/dts/MZK-750DHP.dts
@@ -10,7 +10,10 @@
 	model = "Planex MZK-750DHP";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/MZK-DP150N.dts b/target/linux/ramips/dts/MZK-DP150N.dts
index c63629269..c80074e05 100644
--- a/target/linux/ramips/dts/MZK-DP150N.dts
+++ b/target/linux/ramips/dts/MZK-DP150N.dts
@@ -10,7 +10,10 @@
 	model = "Planex MZK-DP150N";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/MZK-EX300NP.dts b/target/linux/ramips/dts/MZK-EX300NP.dts
index 01a326a54..04e1678bd 100644
--- a/target/linux/ramips/dts/MZK-EX300NP.dts
+++ b/target/linux/ramips/dts/MZK-EX300NP.dts
@@ -10,7 +10,10 @@
 	model = "Planex MZK-EX300NP";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/MZK-EX750NP.dts b/target/linux/ramips/dts/MZK-EX750NP.dts
index 1236df8f1..1ec79c65e 100644
--- a/target/linux/ramips/dts/MZK-EX750NP.dts
+++ b/target/linux/ramips/dts/MZK-EX750NP.dts
@@ -10,7 +10,10 @@
 	model = "Planex MZK-EX750NP";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/MZK-W300NH2.dts b/target/linux/ramips/dts/MZK-W300NH2.dts
index af172f180..5a7447290 100644
--- a/target/linux/ramips/dts/MZK-W300NH2.dts
+++ b/target/linux/ramips/dts/MZK-W300NH2.dts
@@ -10,7 +10,10 @@
 	model = "Planex MZK-W300NH2";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/NA930.dts b/target/linux/ramips/dts/NA930.dts
index fadb484f3..9b734a850 100644
--- a/target/linux/ramips/dts/NA930.dts
+++ b/target/linux/ramips/dts/NA930.dts
@@ -10,7 +10,10 @@
 	model = "Sercomm NA930";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -84,6 +87,8 @@
 		status {
 			label = "na930:blue:status";
 			gpios = <&gpio2 26 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		service {
diff --git a/target/linux/ramips/dts/NBG-419N.dts b/target/linux/ramips/dts/NBG-419N.dts
index 90bac5ce4..9f5d4df11 100644
--- a/target/linux/ramips/dts/NBG-419N.dts
+++ b/target/linux/ramips/dts/NBG-419N.dts
@@ -10,7 +10,10 @@
 	model = "ZyXEL NBG-419N";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/NBG-419N2.dts b/target/linux/ramips/dts/NBG-419N2.dts
index 151da1484..19c268d83 100644
--- a/target/linux/ramips/dts/NBG-419N2.dts
+++ b/target/linux/ramips/dts/NBG-419N2.dts
@@ -10,7 +10,10 @@
 	model = "ZyXEL NBG-419N v2";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	palmbus@10000000 {
@@ -69,6 +72,8 @@
 		usb {
 			label = "nbg-419n2:green:usb";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/NW718.dts b/target/linux/ramips/dts/NW718.dts
index c87a8d3cf..56a27f5f1 100644
--- a/target/linux/ramips/dts/NW718.dts
+++ b/target/linux/ramips/dts/NW718.dts
@@ -10,7 +10,10 @@
 	model = "Netcore NW718";
 
 	aliases {
-		led-status = &led_cpu;
+		led-boot = &led_cpu;
+		led-failsafe = &led_cpu;
+		led-running = &led_cpu;
+		led-upgrade = &led_cpu;
 	};
 
 	gpio-leds {
@@ -24,6 +27,8 @@
 		usb {
 			label = "nw718:amber:usb";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wps {
diff --git a/target/linux/ramips/dts/Newifi-D1.dts b/target/linux/ramips/dts/Newifi-D1.dts
index 772054f3d..eed5c14a9 100644
--- a/target/linux/ramips/dts/Newifi-D1.dts
+++ b/target/linux/ramips/dts/Newifi-D1.dts
@@ -10,7 +10,10 @@
 	model = "Newifi-D1";
 
 	aliases {
-		led-status = &led_blue;
+		led-boot = &led_blue;
+		led-failsafe = &led_blue;
+		led-running = &led_blue;
+		led-upgrade = &led_blue;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/Newifi-D2.dts b/target/linux/ramips/dts/Newifi-D2.dts
index f9c5ca8da..c217f2fc9 100644
--- a/target/linux/ramips/dts/Newifi-D2.dts
+++ b/target/linux/ramips/dts/Newifi-D2.dts
@@ -10,7 +10,10 @@
 	model = "Newifi-D2";
 
 	aliases {
-		led-status = &led_power_blue;
+		led-boot = &led_power_blue;
+		led-failsafe = &led_power_blue;
+		led-running = &led_power_blue;
+		led-upgrade = &led_power_blue;
 	};
 
 	memory@0 {
@@ -58,6 +61,8 @@
 		usb {
 			label = "newifi-d2:blue:usb";
 			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/OMEGA2.dtsi b/target/linux/ramips/dts/OMEGA2.dtsi
index 2dccc20c6..373cd44d0 100644
--- a/target/linux/ramips/dts/OMEGA2.dtsi
+++ b/target/linux/ramips/dts/OMEGA2.dtsi
@@ -7,7 +7,10 @@
 	compatible = "onion,omega2", "mediatek,mt7628an-soc";
 
 	aliases {
-		led-status = &system_led;
+		led-boot = &system_led;
+		led-failsafe = &system_led;
+		led-running = &system_led;
+		led-upgrade = &system_led;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/OY-0001.dts b/target/linux/ramips/dts/OY-0001.dts
index 0aca63eb5..e05a34c40 100644
--- a/target/linux/ramips/dts/OY-0001.dts
+++ b/target/linux/ramips/dts/OY-0001.dts
@@ -10,7 +10,10 @@
 	model = "OY-0001";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/PBR-D1.dts b/target/linux/ramips/dts/PBR-D1.dts
index 01ac2a127..14a2c4e82 100644
--- a/target/linux/ramips/dts/PBR-D1.dts
+++ b/target/linux/ramips/dts/PBR-D1.dts
@@ -10,7 +10,10 @@
 	model = "PBR-D1";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -32,6 +35,8 @@
 		usb {
 			label = "pbr-d1:orange:usb";
 			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 			default-state = "off";
 		};
 
diff --git a/target/linux/ramips/dts/PBR-M1.dts b/target/linux/ramips/dts/PBR-M1.dts
index 1f304a7f7..2ff8940c4 100644
--- a/target/linux/ramips/dts/PBR-M1.dts
+++ b/target/linux/ramips/dts/PBR-M1.dts
@@ -10,7 +10,10 @@
 	model = "PBR-M1";
 
 	aliases {
-		led-status = &led_sys;
+		led-boot = &led_sys;
+		led-failsafe = &led_sys;
+		led-running = &led_sys;
+		led-upgrade = &led_sys;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/PSG1208.dts b/target/linux/ramips/dts/PSG1208.dts
index 0c703f534..4a3291705 100644
--- a/target/linux/ramips/dts/PSG1208.dts
+++ b/target/linux/ramips/dts/PSG1208.dts
@@ -10,7 +10,10 @@
 	model = "Phicomm PSG1208";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/PSG1218A.dts b/target/linux/ramips/dts/PSG1218A.dts
index 5065b7946..57c032f38 100644
--- a/target/linux/ramips/dts/PSG1218A.dts
+++ b/target/linux/ramips/dts/PSG1218A.dts
@@ -7,7 +7,10 @@
 	model = "Phicomm PSG1218 rev.A";
 
 	aliases {
-		led-status = &led_blue;
+		led-boot = &led_blue;
+		led-failsafe = &led_blue;
+		led-running = &led_blue;
+		led-upgrade = &led_blue;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/PSG1218B.dts b/target/linux/ramips/dts/PSG1218B.dts
index 3278a51bf..8b6b8c037 100644
--- a/target/linux/ramips/dts/PSG1218B.dts
+++ b/target/linux/ramips/dts/PSG1218B.dts
@@ -7,7 +7,10 @@
 	model = "Phicomm PSG1218 rev.B";
 
 	aliases {
-		led-status = &led_blue;
+		led-boot = &led_blue;
+		led-failsafe = &led_blue;
+		led-running = &led_blue;
+		led-upgrade = &led_blue;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/PSR-680W.dts b/target/linux/ramips/dts/PSR-680W.dts
index abf5f3c92..29b16fc44 100644
--- a/target/linux/ramips/dts/PSR-680W.dts
+++ b/target/linux/ramips/dts/PSR-680W.dts
@@ -10,7 +10,10 @@
 	model = "Petatel PSR-680W Wireless 3G Router";
 
 	aliases {
-		led-status = &led_wan;
+		led-boot = &led_wan;
+		led-failsafe = &led_wan;
+		led-running = &led_wan;
+		led-upgrade = &led_wan;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/PWH2004.dts b/target/linux/ramips/dts/PWH2004.dts
index aee8fa760..c544fb0b3 100644
--- a/target/linux/ramips/dts/PWH2004.dts
+++ b/target/linux/ramips/dts/PWH2004.dts
@@ -10,7 +10,10 @@
 	model = "Prolink PWH2004";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/PX-4885.dtsi b/target/linux/ramips/dts/PX-4885.dtsi
index 64e007adc..cbfd2d0f3 100644
--- a/target/linux/ramips/dts/PX-4885.dtsi
+++ b/target/linux/ramips/dts/PX-4885.dtsi
@@ -7,7 +7,10 @@
 	compatible = "7links,px-4885", "ralink,rt5350-soc";
 
 	aliases {
-		led-status = &led_wifi;
+		led-boot = &led_wifi;
+		led-failsafe = &led_wifi;
+		led-running = &led_wifi;
+		led-upgrade = &led_wifi;
 	};
 
 	gpio-keys-polled {
@@ -32,6 +35,8 @@
 		storage {
 			label = "px-4885:blue:storage";
 			gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/R6120.dts b/target/linux/ramips/dts/R6120.dts
index eac9e1768..16236924f 100644
--- a/target/linux/ramips/dts/R6120.dts
+++ b/target/linux/ramips/dts/R6120.dts
@@ -10,7 +10,10 @@
 	model = "Netgear AC1200 R6120";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/R6220.dts b/target/linux/ramips/dts/R6220.dts
index 83ba4531d..f9b27daf2 100644
--- a/target/linux/ramips/dts/R6220.dts
+++ b/target/linux/ramips/dts/R6220.dts
@@ -10,7 +10,10 @@
 	model = "Netgear R6220";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
@@ -33,6 +36,8 @@
 		usb {
 			label = "r6220:green:usb";
 			gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
 		};
 
 		internet {
diff --git a/target/linux/ramips/dts/RB750Gr3.dts b/target/linux/ramips/dts/RB750Gr3.dts
index 20198eb9c..8cdba4ce6 100644
--- a/target/linux/ramips/dts/RB750Gr3.dts
+++ b/target/linux/ramips/dts/RB750Gr3.dts
@@ -10,7 +10,10 @@
 	model = "MikroTik RB750Gr3";
 
 	aliases {
-		led-status = &led_pwr;
+		led-boot = &led_pwr;
+		led-failsafe = &led_pwr;
+		led-running = &led_pwr;
+		led-upgrade = &led_pwr;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/RBM11G.dts b/target/linux/ramips/dts/RBM11G.dts
index 41dabdd1a..1288465c3 100644
--- a/target/linux/ramips/dts/RBM11G.dts
+++ b/target/linux/ramips/dts/RBM11G.dts
@@ -10,7 +10,10 @@
 	model = "MikroTik RouterBOARD M11G";
 
 	aliases {
-		led-status = &led_usr;
+		led-boot = &led_usr;
+		led-failsafe = &led_usr;
+		led-running = &led_usr;
+		led-upgrade = &led_usr;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/RBM33G.dts b/target/linux/ramips/dts/RBM33G.dts
index 662aad7b3..beaa9d269 100644
--- a/target/linux/ramips/dts/RBM33G.dts
+++ b/target/linux/ramips/dts/RBM33G.dts
@@ -10,7 +10,10 @@
 	model = "MikroTik RouterBOARD M33G";
 
 	aliases {
-		led-status = &led_usr;
+		led-boot = &led_usr;
+		led-failsafe = &led_usr;
+		led-running = &led_usr;
+		led-upgrade = &led_usr;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/RE350.dts b/target/linux/ramips/dts/RE350.dts
index 0f743239f..15fb08ecb 100644
--- a/target/linux/ramips/dts/RE350.dts
+++ b/target/linux/ramips/dts/RE350.dts
@@ -10,7 +10,10 @@
 	model = "TP-LINK RE350 v1";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/RE6500.dts b/target/linux/ramips/dts/RE6500.dts
index 54433b668..bd32fd2d8 100644
--- a/target/linux/ramips/dts/RE6500.dts
+++ b/target/linux/ramips/dts/RE6500.dts
@@ -10,7 +10,10 @@
 	model = "Linksys RE6500";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/RT-AC51U.dts b/target/linux/ramips/dts/RT-AC51U.dts
index 7281bc9ce..6bed8446e 100644
--- a/target/linux/ramips/dts/RT-AC51U.dts
+++ b/target/linux/ramips/dts/RT-AC51U.dts
@@ -10,7 +10,10 @@
 	model = "Asus RT-AC51U";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
@@ -24,6 +27,8 @@
 		usb {
 			label = "rt-ac51u:blue:usb";
 			gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wifi {
diff --git a/target/linux/ramips/dts/RT-N10-PLUS.dts b/target/linux/ramips/dts/RT-N10-PLUS.dts
index 9e5dcacfb..2ecb31d6f 100644
--- a/target/linux/ramips/dts/RT-N10-PLUS.dts
+++ b/target/linux/ramips/dts/RT-N10-PLUS.dts
@@ -10,7 +10,10 @@
 	model = "Asus RT-N10+";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/RT-N12-PLUS.dts b/target/linux/ramips/dts/RT-N12-PLUS.dts
index f40ed5caa..3c33107d5 100644
--- a/target/linux/ramips/dts/RT-N12-PLUS.dts
+++ b/target/linux/ramips/dts/RT-N12-PLUS.dts
@@ -10,7 +10,10 @@
 	model = "Asus RT-N12+";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/RT-N13U.dts b/target/linux/ramips/dts/RT-N13U.dts
index 4b8ddf7c0..65f0960e7 100644
--- a/target/linux/ramips/dts/RT-N13U.dts
+++ b/target/linux/ramips/dts/RT-N13U.dts
@@ -10,7 +10,10 @@
 	model = "Asus RT-N13U";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/RT-N14U.dts b/target/linux/ramips/dts/RT-N14U.dts
index 3a72026a2..a3b0d79e4 100644
--- a/target/linux/ramips/dts/RT-N14U.dts
+++ b/target/linux/ramips/dts/RT-N14U.dts
@@ -10,7 +10,10 @@
 	model = "Asus RT-N14U";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
@@ -29,6 +32,8 @@
 		usb {
 			label = "rt-n14u:blue:usb";
 			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		led_power: power {
diff --git a/target/linux/ramips/dts/RT-N15.dts b/target/linux/ramips/dts/RT-N15.dts
index 7764eb536..414f6edd9 100644
--- a/target/linux/ramips/dts/RT-N15.dts
+++ b/target/linux/ramips/dts/RT-N15.dts
@@ -12,7 +12,10 @@
 	model = "Asus RT-N15";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/RT-N56U.dts b/target/linux/ramips/dts/RT-N56U.dts
index 3c5148c67..a79967912 100644
--- a/target/linux/ramips/dts/RT-N56U.dts
+++ b/target/linux/ramips/dts/RT-N56U.dts
@@ -10,7 +10,10 @@
 	model = "Asus RT-N56U";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	nor-flash@1c000000 {
diff --git a/target/linux/ramips/dts/RUT5XX.dts b/target/linux/ramips/dts/RUT5XX.dts
index 45f39b260..4816324cf 100644
--- a/target/linux/ramips/dts/RUT5XX.dts
+++ b/target/linux/ramips/dts/RUT5XX.dts
@@ -10,7 +10,10 @@
 	model = "Teltonika RUT5XX";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/SAP-G3200U3.dts b/target/linux/ramips/dts/SAP-G3200U3.dts
index 4ca5e889d..353bae597 100644
--- a/target/linux/ramips/dts/SAP-G3200U3.dts
+++ b/target/linux/ramips/dts/SAP-G3200U3.dts
@@ -9,10 +9,6 @@
 	compatible = "storylink,sap-g3200u3", "mediatek,mt7621-soc";
 	model = "STORYLiNK SAP-G3200U3";
 
-	aliases {
-		led-status = &led_usb;
-	};
-
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
@@ -25,9 +21,11 @@
 	gpio-leds {
 		compatible = "gpio-leds";
 
-		led_usb: usb {
+		usb {
 			label = "sap-g3200u3:green:usb";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/SK-WB8.dts b/target/linux/ramips/dts/SK-WB8.dts
index 7cbd205ac..571ff3efe 100644
--- a/target/linux/ramips/dts/SK-WB8.dts
+++ b/target/linux/ramips/dts/SK-WB8.dts
@@ -9,7 +9,10 @@
 	model = "SamKnows Whitebox 8";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	memory@0 {
@@ -32,6 +35,8 @@
 		usb {
 			label = "sk-wb8:green:usb";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/SL-R7205.dts b/target/linux/ramips/dts/SL-R7205.dts
index 5ecd8381d..9d205131c 100644
--- a/target/linux/ramips/dts/SL-R7205.dts
+++ b/target/linux/ramips/dts/SL-R7205.dts
@@ -10,7 +10,10 @@
 	model = "Skyline SL-R7205 Wireless 3G Router";
 
 	aliases {
-		led-status = &led_wifi;
+		led-boot = &led_wifi;
+		led-failsafe = &led_wifi;
+		led-running = &led_wifi;
+		led-upgrade = &led_wifi;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/TEW-638APB-V2.dts b/target/linux/ramips/dts/TEW-638APB-V2.dts
index b69a77ba2..b58cfc44e 100644
--- a/target/linux/ramips/dts/TEW-638APB-V2.dts
+++ b/target/linux/ramips/dts/TEW-638APB-V2.dts
@@ -10,7 +10,10 @@
 	model = "TRENDnet TEW-638APB v2";
 
 	aliases {
-		led-status = &led_wps_green;
+		led-boot = &led_wps_green;
+		led-failsafe = &led_wps_green;
+		led-running = &led_wps_green;
+		led-upgrade = &led_wps_green;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/TEW-691GR.dts b/target/linux/ramips/dts/TEW-691GR.dts
index 23f1a91e4..219a10805 100644
--- a/target/linux/ramips/dts/TEW-691GR.dts
+++ b/target/linux/ramips/dts/TEW-691GR.dts
@@ -10,7 +10,10 @@
 	model = "TRENDnet TEW-691GR";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	nor-flash@1c000000 {
diff --git a/target/linux/ramips/dts/TEW-692GR.dts b/target/linux/ramips/dts/TEW-692GR.dts
index 8bb7f1748..fac85f7fc 100644
--- a/target/linux/ramips/dts/TEW-692GR.dts
+++ b/target/linux/ramips/dts/TEW-692GR.dts
@@ -10,7 +10,10 @@
 	model = "TRENDnet TEW-692GR";
 
 	aliases {
-		led-status = &led_wps_green;
+		led-boot = &led_wps_green;
+		led-failsafe = &led_wps_green;
+		led-running = &led_wps_green;
+		led-upgrade = &led_wps_green;
 	};
 
 	nor-flash@1c000000 {
diff --git a/target/linux/ramips/dts/TEW-714TRU.dts b/target/linux/ramips/dts/TEW-714TRU.dts
index 0fc798ee1..b9cb5ba77 100644
--- a/target/linux/ramips/dts/TEW-714TRU.dts
+++ b/target/linux/ramips/dts/TEW-714TRU.dts
@@ -15,6 +15,8 @@
 		usb {
 			label = "tew-714tru:red:usb";
 			gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wifi {
diff --git a/target/linux/ramips/dts/TINY-AC.dts b/target/linux/ramips/dts/TINY-AC.dts
index ed539b1d0..e81f0cbdb 100644
--- a/target/linux/ramips/dts/TINY-AC.dts
+++ b/target/linux/ramips/dts/TINY-AC.dts
@@ -19,6 +19,8 @@
 		usb {
 			label = "tiny-ac:green:usb";
 			gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wifi {
diff --git a/target/linux/ramips/dts/TL-MR3020V3.dts b/target/linux/ramips/dts/TL-MR3020V3.dts
index 5bc1a82cc..a3285def9 100644
--- a/target/linux/ramips/dts/TL-MR3020V3.dts
+++ b/target/linux/ramips/dts/TL-MR3020V3.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link TL-MR3020 v3";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -57,6 +60,8 @@
 		wan {
 			label = "tl-mr3020-v3:green:3g";
 			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ehci_port1>, <&ohci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wlan {
diff --git a/target/linux/ramips/dts/TL-MR3420V5.dts b/target/linux/ramips/dts/TL-MR3420V5.dts
index 8845e8075..80436b870 100644
--- a/target/linux/ramips/dts/TL-MR3420V5.dts
+++ b/target/linux/ramips/dts/TL-MR3420V5.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link TL-MR3420 v5";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
@@ -46,6 +49,8 @@
 		usb {
 			label = "tl-mr3420-v5:green:usb";
 			gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wan {
diff --git a/target/linux/ramips/dts/TL-WA801NDV5.dts b/target/linux/ramips/dts/TL-WA801NDV5.dts
index 9e3844d11..ad9177617 100644
--- a/target/linux/ramips/dts/TL-WA801NDV5.dts
+++ b/target/linux/ramips/dts/TL-WA801NDV5.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link TL-WA801ND v5";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/TL-WR840NV4.dts b/target/linux/ramips/dts/TL-WR840NV4.dts
index 9290019e2..df892a0d2 100644
--- a/target/linux/ramips/dts/TL-WR840NV4.dts
+++ b/target/linux/ramips/dts/TL-WR840NV4.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link TL-WR840N v4";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/TL-WR840NV5.dts b/target/linux/ramips/dts/TL-WR840NV5.dts
index fe8fba227..fc3d0aa32 100644
--- a/target/linux/ramips/dts/TL-WR840NV5.dts
+++ b/target/linux/ramips/dts/TL-WR840NV5.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link TL-WR840N v5";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/TL-WR841NV13.dts b/target/linux/ramips/dts/TL-WR841NV13.dts
index baba0015e..a9a01fea2 100644
--- a/target/linux/ramips/dts/TL-WR841NV13.dts
+++ b/target/linux/ramips/dts/TL-WR841NV13.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link TL-WR841N v13";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/TL-WR842NV5.dts b/target/linux/ramips/dts/TL-WR842NV5.dts
index c20e78061..9d1e39966 100644
--- a/target/linux/ramips/dts/TL-WR842NV5.dts
+++ b/target/linux/ramips/dts/TL-WR842NV5.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link TL-WR842N v5";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
@@ -46,6 +49,8 @@
 		usb {
 			label = "tl-wr842n-v5:green:usb";
 			gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wan {
diff --git a/target/linux/ramips/dts/TL-WR902ACV3.dts b/target/linux/ramips/dts/TL-WR902ACV3.dts
index 014c545e9..b78604128 100644
--- a/target/linux/ramips/dts/TL-WR902ACV3.dts
+++ b/target/linux/ramips/dts/TL-WR902ACV3.dts
@@ -10,7 +10,10 @@
 	model = "TP-Link TL-WR902AC v3";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
@@ -58,6 +61,8 @@
 		usb {
 			label = "tl-wr902ac-v3:green:usb";
 			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wan {
diff --git a/target/linux/ramips/dts/Timecloud.dts b/target/linux/ramips/dts/Timecloud.dts
index 641a225ae..a6274a0c5 100644
--- a/target/linux/ramips/dts/Timecloud.dts
+++ b/target/linux/ramips/dts/Timecloud.dts
@@ -10,7 +10,10 @@
 	model = "Thunder Timecloud";
 
 	aliases {
-		led-status = &led_statuso;
+		led-boot = &led_statuso;
+		led-failsafe = &led_statuso;
+		led-running = &led_statuso;
+		led-upgrade = &led_statuso;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/U25AWF-H1.dts b/target/linux/ramips/dts/U25AWF-H1.dts
index 54c763bea..6a6c81d83 100644
--- a/target/linux/ramips/dts/U25AWF-H1.dts
+++ b/target/linux/ramips/dts/U25AWF-H1.dts
@@ -10,7 +10,10 @@
 	model = "Kimax U25AWF-H1";
 
 	aliases {
-		led-status = &led_wifi;
+		led-boot = &led_wifi;
+		led-failsafe = &led_wifi;
+		led-running = &led_wifi;
+		led-upgrade = &led_wifi;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/U35WF.dts b/target/linux/ramips/dts/U35WF.dts
index b950fddc0..baa15ce38 100644
--- a/target/linux/ramips/dts/U35WF.dts
+++ b/target/linux/ramips/dts/U35WF.dts
@@ -10,7 +10,10 @@
 	model = "Kimax U35WF";
 
 	aliases {
-		led-status = &led_wifi;
+		led-boot = &led_wifi;
+		led-failsafe = &led_wifi;
+		led-running = &led_wifi;
+		led-upgrade = &led_wifi;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/U7621-06.dtsi b/target/linux/ramips/dts/U7621-06.dtsi
index 80c129dfb..2bfd4d71f 100644
--- a/target/linux/ramips/dts/U7621-06.dtsi
+++ b/target/linux/ramips/dts/U7621-06.dtsi
@@ -41,7 +41,10 @@
 	compatible = "unielec,u7621-06", "mediatek,mt7621-soc";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/U7628-01.dtsi b/target/linux/ramips/dts/U7628-01.dtsi
index f9f94be82..3ba6b8e80 100644
--- a/target/linux/ramips/dts/U7628-01.dtsi
+++ b/target/linux/ramips/dts/U7628-01.dtsi
@@ -41,7 +41,10 @@
 	compatible = "unielec,u7628-01", "mediatek,mt7628an-soc";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -99,6 +102,8 @@
 		usb {
 			label = "u7628-01:green:usb";
 			gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/UR-326N4G.dts b/target/linux/ramips/dts/UR-326N4G.dts
index 367b53838..921f427ea 100644
--- a/target/linux/ramips/dts/UR-326N4G.dts
+++ b/target/linux/ramips/dts/UR-326N4G.dts
@@ -10,7 +10,10 @@
 	model = "UPVEL UR-326N4G";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/UR-336UN.dts b/target/linux/ramips/dts/UR-336UN.dts
index 8acbc9e25..6de90b3b1 100644
--- a/target/linux/ramips/dts/UR-336UN.dts
+++ b/target/linux/ramips/dts/UR-336UN.dts
@@ -10,7 +10,10 @@
 	model = "UPVEL UR-336UN";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/V11STFE.dts b/target/linux/ramips/dts/V11STFE.dts
index 899330d77..e0cf114bf 100644
--- a/target/linux/ramips/dts/V11STFE.dts
+++ b/target/linux/ramips/dts/V11STFE.dts
@@ -10,7 +10,10 @@
 	model = "Ralink V11ST-FE";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	nor-flash@1c000000 {
diff --git a/target/linux/ramips/dts/V22RW-2X2.dts b/target/linux/ramips/dts/V22RW-2X2.dts
index 8fe822505..ca3d51265 100644
--- a/target/linux/ramips/dts/V22RW-2X2.dts
+++ b/target/linux/ramips/dts/V22RW-2X2.dts
@@ -10,7 +10,10 @@
 	model = "Ralink AP-RT3052-V22RW-2X2";
 
 	aliases {
-		led-status = &led_security;
+		led-boot = &led_security;
+		led-failsafe = &led_security;
+		led-running = &led_security;
+		led-upgrade = &led_security;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/VAR11N-300.dts b/target/linux/ramips/dts/VAR11N-300.dts
index 8fec52730..5eb8b8c95 100644
--- a/target/linux/ramips/dts/VAR11N-300.dts
+++ b/target/linux/ramips/dts/VAR11N-300.dts
@@ -10,7 +10,10 @@
 	model = "Vonets VAR11N-300";
 
 	aliases {
-		led-status = &led_system;
+		led-boot = &led_system;
+		led-failsafe = &led_system;
+		led-running = &led_system;
+		led-upgrade = &led_system;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/VOCORE.dtsi b/target/linux/ramips/dts/VOCORE.dtsi
index 9b214dde8..cee7e38ca 100644
--- a/target/linux/ramips/dts/VOCORE.dtsi
+++ b/target/linux/ramips/dts/VOCORE.dtsi
@@ -6,7 +6,10 @@
 	compatible = "vocore,vocore", "ralink,rt5350-soc";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-export {
diff --git a/target/linux/ramips/dts/VOCORE2.dts b/target/linux/ramips/dts/VOCORE2.dts
index 89c975ab2..2744f8045 100644
--- a/target/linux/ramips/dts/VOCORE2.dts
+++ b/target/linux/ramips/dts/VOCORE2.dts
@@ -9,7 +9,10 @@
 	model = "VoCore2";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/VOCORE2LITE.dts b/target/linux/ramips/dts/VOCORE2LITE.dts
index b9cfdfc65..fbe4ed3f7 100644
--- a/target/linux/ramips/dts/VOCORE2LITE.dts
+++ b/target/linux/ramips/dts/VOCORE2LITE.dts
@@ -9,7 +9,10 @@
 	model = "VoCore2-Lite";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/VR500.dts b/target/linux/ramips/dts/VR500.dts
index 48da2b5dd..d3ef2cae7 100644
--- a/target/linux/ramips/dts/VR500.dts
+++ b/target/linux/ramips/dts/VR500.dts
@@ -10,7 +10,10 @@
 	model = "Planex VR500";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/W150M.dts b/target/linux/ramips/dts/W150M.dts
index e963f2a59..3d419b085 100644
--- a/target/linux/ramips/dts/W150M.dts
+++ b/target/linux/ramips/dts/W150M.dts
@@ -10,7 +10,10 @@
 	model = "Tenda W150M";
 
 	aliases {
-		led-status = &led_ap;
+		led-boot = &led_ap;
+		led-failsafe = &led_ap;
+		led-running = &led_ap;
+		led-upgrade = &led_ap;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/W2914NSV2.dts b/target/linux/ramips/dts/W2914NSV2.dts
index e1a9c4162..4c13122c1 100644
--- a/target/linux/ramips/dts/W2914NSV2.dts
+++ b/target/linux/ramips/dts/W2914NSV2.dts
@@ -16,6 +16,8 @@
 		usb {
 			label = "w2914nsv2:green:usb";
 			gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
 		};
 	};
 };
diff --git a/target/linux/ramips/dts/W306R_V20.dts b/target/linux/ramips/dts/W306R_V20.dts
index 75df091b0..7e4d650a0 100644
--- a/target/linux/ramips/dts/W306R_V20.dts
+++ b/target/linux/ramips/dts/W306R_V20.dts
@@ -10,7 +10,10 @@
 	model = "Tenda W306R V2.0";
 
 	aliases {
-		led-status = &led_sys;
+		led-boot = &led_sys;
+		led-failsafe = &led_sys;
+		led-running = &led_sys;
+		led-upgrade = &led_sys;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/W502U.dts b/target/linux/ramips/dts/W502U.dts
index 6b8775ef3..389a467d8 100644
--- a/target/linux/ramips/dts/W502U.dts
+++ b/target/linux/ramips/dts/W502U.dts
@@ -10,7 +10,10 @@
 	model = "ALFA Networks W502U";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	chosen {
@@ -59,6 +62,8 @@
 		usb {
 			label = "w502u:blue:usb";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		led_wps: wps {
diff --git a/target/linux/ramips/dts/WCR-1166DS.dts b/target/linux/ramips/dts/WCR-1166DS.dts
index 420b3e5ab..ca715c8ba 100644
--- a/target/linux/ramips/dts/WCR-1166DS.dts
+++ b/target/linux/ramips/dts/WCR-1166DS.dts
@@ -10,7 +10,10 @@
 	model = "Buffalo WCR-1166DS";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/WCR150GN.dts b/target/linux/ramips/dts/WCR150GN.dts
index 93c7c5493..3f8783fe5 100644
--- a/target/linux/ramips/dts/WCR150GN.dts
+++ b/target/linux/ramips/dts/WCR150GN.dts
@@ -10,7 +10,10 @@
 	model = "Sparklan WCR-150GN";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
@@ -55,6 +58,8 @@
 		user {
 			label = "wcr-150gn:amber:user";
 			gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		led_power: power {
diff --git a/target/linux/ramips/dts/WE1026-5G.dtsi b/target/linux/ramips/dts/WE1026-5G.dtsi
index f82c4b94b..e6c4b8c1b 100644
--- a/target/linux/ramips/dts/WE1026-5G.dtsi
+++ b/target/linux/ramips/dts/WE1026-5G.dtsi
@@ -53,6 +53,8 @@
 		usb {
 			label = "we1026-5g:green:usb";
 			gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wifi {
diff --git a/target/linux/ramips/dts/WF-2881.dts b/target/linux/ramips/dts/WF-2881.dts
index 17011b1e3..5d1781fcf 100644
--- a/target/linux/ramips/dts/WF-2881.dts
+++ b/target/linux/ramips/dts/WF-2881.dts
@@ -10,7 +10,10 @@
 	model = "NETIS WF-2881";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	memory@0 {
@@ -28,6 +31,8 @@
 		usb {
 			label = "wf-2881:green:usb";
 			gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
 		};
 
 		led_wps: wps {
diff --git a/target/linux/ramips/dts/WHR-1166D.dts b/target/linux/ramips/dts/WHR-1166D.dts
index bfa0ebd64..c51aef13c 100644
--- a/target/linux/ramips/dts/WHR-1166D.dts
+++ b/target/linux/ramips/dts/WHR-1166D.dts
@@ -10,7 +10,10 @@
 	model = "Buffalo WHR-1166D";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/WHR-300HP2.dts b/target/linux/ramips/dts/WHR-300HP2.dts
index 7acc84f16..33f0bc664 100644
--- a/target/linux/ramips/dts/WHR-300HP2.dts
+++ b/target/linux/ramips/dts/WHR-300HP2.dts
@@ -10,7 +10,10 @@
 	model = "Buffalo WHR-300HP2";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/WHR-600D.dts b/target/linux/ramips/dts/WHR-600D.dts
index 8fa4aa6e3..80b88393c 100644
--- a/target/linux/ramips/dts/WHR-600D.dts
+++ b/target/linux/ramips/dts/WHR-600D.dts
@@ -10,7 +10,10 @@
 	model = "Buffalo WHR-600D";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/WHR-G300N.dts b/target/linux/ramips/dts/WHR-G300N.dts
index ce0d989ba..86e0972ff 100644
--- a/target/linux/ramips/dts/WHR-G300N.dts
+++ b/target/linux/ramips/dts/WHR-G300N.dts
@@ -10,7 +10,10 @@
 	model = "Buffalo WHR-G300N";
 
 	aliases {
-		led-status = &led_router;
+		led-boot = &led_router;
+		led-failsafe = &led_router;
+		led-running = &led_router;
+		led-upgrade = &led_router;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/WIDORA-NEO.dtsi b/target/linux/ramips/dts/WIDORA-NEO.dtsi
index 4c037c703..4d2ebb20c 100644
--- a/target/linux/ramips/dts/WIDORA-NEO.dtsi
+++ b/target/linux/ramips/dts/WIDORA-NEO.dtsi
@@ -7,7 +7,10 @@
 	compatible = "widora,neo", "mediatek,mt7628an-soc";
 
 	aliases {
-		led-status = &led_wifi;
+		led-boot = &led_wifi;
+		led-failsafe = &led_wifi;
+		led-running = &led_wifi;
+		led-upgrade = &led_wifi;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/WIZFI630A.dts
index efd1038b8..cfd9fb1e3 100644
--- a/target/linux/ramips/dts/WIZFI630A.dts
+++ b/target/linux/ramips/dts/WIZFI630A.dts
@@ -10,7 +10,10 @@
 	model = "WIZnet WizFi630A";
 
 	aliases {
-		led-status = &led_run;
+		led-boot = &led_run;
+		led-failsafe = &led_run;
+		led-running = &led_run;
+		led-upgrade = &led_run;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/WL-330N.dts b/target/linux/ramips/dts/WL-330N.dts
index 31456c6cf..dd4067b04 100644
--- a/target/linux/ramips/dts/WL-330N.dts
+++ b/target/linux/ramips/dts/WL-330N.dts
@@ -10,7 +10,10 @@
 	model = "Asus WL-330N";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/WL-330N3G.dts b/target/linux/ramips/dts/WL-330N3G.dts
index 35836fb6f..62eeeefc0 100644
--- a/target/linux/ramips/dts/WL-330N3G.dts
+++ b/target/linux/ramips/dts/WL-330N3G.dts
@@ -10,7 +10,10 @@
 	model = "Asus WL-330N3G";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/WL-351.dts b/target/linux/ramips/dts/WL-351.dts
index baa6f131a..b6bf41127 100644
--- a/target/linux/ramips/dts/WL-351.dts
+++ b/target/linux/ramips/dts/WL-351.dts
@@ -10,7 +10,10 @@
 	model = "Sitecom WL-351 v1 002";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/WLI-TX4-AG300N.dts b/target/linux/ramips/dts/WLI-TX4-AG300N.dts
index bfe4490af..8d09773c1 100644
--- a/target/linux/ramips/dts/WLI-TX4-AG300N.dts
+++ b/target/linux/ramips/dts/WLI-TX4-AG300N.dts
@@ -12,7 +12,10 @@
 	model = "Buffalo WLI-TX4-AG300N";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/WLR-6000.dts b/target/linux/ramips/dts/WLR-6000.dts
index a005774d0..c9cce008f 100644
--- a/target/linux/ramips/dts/WLR-6000.dts
+++ b/target/linux/ramips/dts/WLR-6000.dts
@@ -10,7 +10,10 @@
 	model = "Sitecom WLR-6000";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/WMR-300.dts b/target/linux/ramips/dts/WMR-300.dts
index 662da6140..e865bb9c6 100644
--- a/target/linux/ramips/dts/WMR-300.dts
+++ b/target/linux/ramips/dts/WMR-300.dts
@@ -10,7 +10,10 @@
 	model = "Buffalo WMR-300";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/WN-AX1167GR.dts b/target/linux/ramips/dts/WN-AX1167GR.dts
index 3015bdbbe..f9aa5c2cf 100644
--- a/target/linux/ramips/dts/WN-AX1167GR.dts
+++ b/target/linux/ramips/dts/WN-AX1167GR.dts
@@ -10,7 +10,10 @@
 	model = "I-O DATA WN-AX1167GR";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/WN-GX300GR.dts b/target/linux/ramips/dts/WN-GX300GR.dts
index 491a93c87..c2d5ce0cf 100644
--- a/target/linux/ramips/dts/WN-GX300GR.dts
+++ b/target/linux/ramips/dts/WN-GX300GR.dts
@@ -10,7 +10,10 @@
 	model = "I-O DATA WN-GX300GR";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/WN3000RPV3.dts b/target/linux/ramips/dts/WN3000RPV3.dts
index ba81397f8..3dba92833 100644
--- a/target/linux/ramips/dts/WN3000RPV3.dts
+++ b/target/linux/ramips/dts/WN3000RPV3.dts
@@ -12,7 +12,10 @@
 	model = "Netgear WN3000RPv3";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/WNCE2001.dts b/target/linux/ramips/dts/WNCE2001.dts
index a89bb8a72..46b0e5d02 100644
--- a/target/linux/ramips/dts/WNCE2001.dts
+++ b/target/linux/ramips/dts/WNCE2001.dts
@@ -10,7 +10,10 @@
 	model = "Netgear WNCE2001";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/WNDR3700V5.dts b/target/linux/ramips/dts/WNDR3700V5.dts
index 3d3fde997..0f8af050e 100644
--- a/target/linux/ramips/dts/WNDR3700V5.dts
+++ b/target/linux/ramips/dts/WNDR3700V5.dts
@@ -10,7 +10,10 @@
 	model = "Netgear WNDR3700v5";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/WR1200JS.dts b/target/linux/ramips/dts/WR1200JS.dts
index f79164864..e1f3247aa 100644
--- a/target/linux/ramips/dts/WR1200JS.dts
+++ b/target/linux/ramips/dts/WR1200JS.dts
@@ -10,7 +10,8 @@
 	model = "YouHua WR1200JS";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
 	};
 
 	memory@0 {
@@ -38,6 +39,8 @@
 		usb {
 			label = "wr1200js:blue:usb";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/WR512-3GN.dtsi b/target/linux/ramips/dts/WR512-3GN.dtsi
index 4b55869a9..f0612ab0b 100644
--- a/target/linux/ramips/dts/WR512-3GN.dtsi
+++ b/target/linux/ramips/dts/WR512-3GN.dtsi
@@ -7,7 +7,10 @@
 	compatible = "unbranded,wr512-3gn", "ralink,rt3052-soc";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/WRC-1167GHBK2-S.dts b/target/linux/ramips/dts/WRC-1167GHBK2-S.dts
index 05c1749d2..93ec0ce8e 100644
--- a/target/linux/ramips/dts/WRC-1167GHBK2-S.dts
+++ b/target/linux/ramips/dts/WRC-1167GHBK2-S.dts
@@ -10,7 +10,10 @@
 	model = "ELECOM WRC-1167GHBK2-S";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/WRH-300CR.dts b/target/linux/ramips/dts/WRH-300CR.dts
index 22a8788e4..c8e1d794e 100644
--- a/target/linux/ramips/dts/WRH-300CR.dts
+++ b/target/linux/ramips/dts/WRH-300CR.dts
@@ -10,7 +10,10 @@
 	model = "ELECOM WRH-300CR";
 
 	aliases {
-		led-status = &led_wps;
+		led-boot = &led_wps;
+		led-failsafe = &led_wps;
+		led-running = &led_wps;
+		led-upgrade = &led_wps;
 	};
 
 		gpio-leds {
diff --git a/target/linux/ramips/dts/WRTNODE.dts b/target/linux/ramips/dts/WRTNODE.dts
index 665693f9d..93b26c2a2 100644
--- a/target/linux/ramips/dts/WRTNODE.dts
+++ b/target/linux/ramips/dts/WRTNODE.dts
@@ -9,7 +9,10 @@
 	model = "WRTNODE";
 
 	aliases {
-		led-status = &led_indicator;
+		led-boot = &led_indicator;
+		led-failsafe = &led_indicator;
+		led-running = &led_indicator;
+		led-upgrade = &led_indicator;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/WRTNODE2P.dts b/target/linux/ramips/dts/WRTNODE2P.dts
index d49470afb..522df7cd9 100644
--- a/target/linux/ramips/dts/WRTNODE2P.dts
+++ b/target/linux/ramips/dts/WRTNODE2P.dts
@@ -7,7 +7,10 @@
 	model = "WRTnode2P";
 
 	aliases {
-		led-status = &led_indicator;
+		led-boot = &led_indicator;
+		led-failsafe = &led_indicator;
+		led-running = &led_indicator;
+		led-upgrade = &led_indicator;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/WRTNODE2R.dts b/target/linux/ramips/dts/WRTNODE2R.dts
index 79f65e059..ee1e2f91b 100644
--- a/target/linux/ramips/dts/WRTNODE2R.dts
+++ b/target/linux/ramips/dts/WRTNODE2R.dts
@@ -7,7 +7,10 @@
 	model = "WRTnode2R";
 
 	aliases {
-		led-status = &led_indicator;
+		led-boot = &led_indicator;
+		led-failsafe = &led_indicator;
+		led-running = &led_indicator;
+		led-upgrade = &led_indicator;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/WSR-1166.dts b/target/linux/ramips/dts/WSR-1166.dts
index 28ac6ab6d..3ab2e600d 100644
--- a/target/linux/ramips/dts/WSR-1166.dts
+++ b/target/linux/ramips/dts/WSR-1166.dts
@@ -10,7 +10,10 @@
 	model = "Buffalo WSR-1166DHP";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/WSR-600.dts b/target/linux/ramips/dts/WSR-600.dts
index faee19dce..ca71819ed 100644
--- a/target/linux/ramips/dts/WSR-600.dts
+++ b/target/linux/ramips/dts/WSR-600.dts
@@ -10,7 +10,10 @@
 	model = "Buffalo WSR-600DHP";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/WT3020.dtsi b/target/linux/ramips/dts/WT3020.dtsi
index 2b227ed9b..67ded65bd 100644
--- a/target/linux/ramips/dts/WT3020.dtsi
+++ b/target/linux/ramips/dts/WT3020.dtsi
@@ -7,7 +7,10 @@
 	compatible = "nexx,wt3020", "ralink,mt7620n-soc";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-keys-polled {
diff --git a/target/linux/ramips/dts/WZR-AGL300NH.dts b/target/linux/ramips/dts/WZR-AGL300NH.dts
index e0b93a826..fba465784 100644
--- a/target/linux/ramips/dts/WZR-AGL300NH.dts
+++ b/target/linux/ramips/dts/WZR-AGL300NH.dts
@@ -12,7 +12,10 @@
 	model = "Buffalo WZR-AGL300NH";
 
 	aliases {
-		led-status = &led_router;
+		led-boot = &led_router;
+		led-failsafe = &led_router;
+		led-running = &led_router;
+		led-upgrade = &led_router;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/X5.dts b/target/linux/ramips/dts/X5.dts
index ebd7d17d0..06d25bee7 100644
--- a/target/linux/ramips/dts/X5.dts
+++ b/target/linux/ramips/dts/X5.dts
@@ -10,7 +10,10 @@
 	model = "Poray X5";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/X8.dts b/target/linux/ramips/dts/X8.dts
index 14aea65c0..a6467862c 100644
--- a/target/linux/ramips/dts/X8.dts
+++ b/target/linux/ramips/dts/X8.dts
@@ -10,7 +10,10 @@
 	model = "Poray X8";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/XDXRN502J.dts b/target/linux/ramips/dts/XDXRN502J.dts
index a03c64a82..34f9b7ecc 100644
--- a/target/linux/ramips/dts/XDXRN502J.dts
+++ b/target/linux/ramips/dts/XDXRN502J.dts
@@ -10,7 +10,10 @@
 	model = "XDX RN502J";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
diff --git a/target/linux/ramips/dts/Y1.dts b/target/linux/ramips/dts/Y1.dts
index d9d00f082..1538ba92c 100644
--- a/target/linux/ramips/dts/Y1.dts
+++ b/target/linux/ramips/dts/Y1.dts
@@ -7,7 +7,10 @@
 	model = "Lenovo Y1";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
@@ -31,6 +34,8 @@
 		usb {
 			label = "y1:blue:usb";
 			gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		lan {
diff --git a/target/linux/ramips/dts/Y1S.dts b/target/linux/ramips/dts/Y1S.dts
index 51bd10d75..d2b917e80 100644
--- a/target/linux/ramips/dts/Y1S.dts
+++ b/target/linux/ramips/dts/Y1S.dts
@@ -7,7 +7,10 @@
 	model = "Lenovo Y1S";
 
 	aliases {
-		led-status = &led_power_blue;
+		led-boot = &led_power_blue;
+		led-failsafe = &led_power_blue;
+		led-running = &led_power_blue;
+		led-upgrade = &led_power_blue;
 	};
 
 	gpio_export {
@@ -62,6 +65,8 @@
 		usb2 {
 			label = "y1s:blue:usb";
 			gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		internet {
diff --git a/target/linux/ramips/dts/YOUKU-YK1.dts b/target/linux/ramips/dts/YOUKU-YK1.dts
index 5c0699e2e..0716b24ea 100644
--- a/target/linux/ramips/dts/YOUKU-YK1.dts
+++ b/target/linux/ramips/dts/YOUKU-YK1.dts
@@ -10,7 +10,10 @@
 	model = "YOUKU YK1";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
@@ -26,6 +29,8 @@
 		usb {
 			label = "youku-yk1:blue:usb";
 			gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 		led_power: power {
 			label = "youku-yk1:blue:power";
diff --git a/target/linux/ramips/dts/ZBT-CPE102.dts b/target/linux/ramips/dts/ZBT-CPE102.dts
index eeaf07e33..4da8644a9 100644
--- a/target/linux/ramips/dts/ZBT-CPE102.dts
+++ b/target/linux/ramips/dts/ZBT-CPE102.dts
@@ -15,7 +15,8 @@
 
 
 	aliases {
-		led-status = &led_4g_0;
+		led-boot = &led_4g_0;
+		led-failsafe = &led_4g_0;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/ZBT-WA05.dts b/target/linux/ramips/dts/ZBT-WA05.dts
index bd5bdb26b..e05ca55fc 100644
--- a/target/linux/ramips/dts/ZBT-WA05.dts
+++ b/target/linux/ramips/dts/ZBT-WA05.dts
@@ -10,7 +10,10 @@
 	model = "Zbtlink ZBT-WA05";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -28,6 +31,8 @@
 		usb {
 			label = "zbt-wa05:blue:usb";
 			gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		air {
diff --git a/target/linux/ramips/dts/ZBT-WE1226.dts b/target/linux/ramips/dts/ZBT-WE1226.dts
index 426d9ad8e..92d8e71fc 100644
--- a/target/linux/ramips/dts/ZBT-WE1226.dts
+++ b/target/linux/ramips/dts/ZBT-WE1226.dts
@@ -9,7 +9,10 @@
 	model = "Zbtlink ZBT-WE1226";
 
 	aliases {
-		led-status = &led_wlan;
+		led-boot = &led_wlan;
+		led-failsafe = &led_wlan;
+		led-running = &led_wlan;
+		led-upgrade = &led_wlan;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/ZBT-WE2026.dts b/target/linux/ramips/dts/ZBT-WE2026.dts
index 6cb07ca8a..4a29ef6fa 100644
--- a/target/linux/ramips/dts/ZBT-WE2026.dts
+++ b/target/linux/ramips/dts/ZBT-WE2026.dts
@@ -10,7 +10,10 @@
 	model = "Zbtlink ZBT-WE2026";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
diff --git a/target/linux/ramips/dts/ZBT-WE826.dtsi b/target/linux/ramips/dts/ZBT-WE826.dtsi
index 1210568ca..4fa81b73e 100644
--- a/target/linux/ramips/dts/ZBT-WE826.dtsi
+++ b/target/linux/ramips/dts/ZBT-WE826.dtsi
@@ -7,7 +7,10 @@
 	compatible = "zbtlink,zbt-we826", "ralink,mt7620a-soc";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	chosen {
@@ -23,6 +26,8 @@
 		usb {
 			label = "zbt-we826:green:usb";
 			gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 		air {
 			label = "zbt-we826:green:wifi";
diff --git a/target/linux/ramips/dts/ZBT-WG2626.dts b/target/linux/ramips/dts/ZBT-WG2626.dts
index 469977bb4..4da8ae7d5 100644
--- a/target/linux/ramips/dts/ZBT-WG2626.dts
+++ b/target/linux/ramips/dts/ZBT-WG2626.dts
@@ -10,7 +10,10 @@
 	model = "ZBT-WG2626";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/ZBT-WG3526.dtsi b/target/linux/ramips/dts/ZBT-WG3526.dtsi
index 17ddae848..2a73b8de8 100644
--- a/target/linux/ramips/dts/ZBT-WG3526.dtsi
+++ b/target/linux/ramips/dts/ZBT-WG3526.dtsi
@@ -7,7 +7,10 @@
 	compatible = "zbtlink,zbt-wg3526", "mediatek,mt7621-soc";
 
 	aliases {
-		led-status = &led_status;
+		led-boot = &led_status;
+		led-failsafe = &led_status;
+		led-running = &led_status;
+		led-upgrade = &led_status;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/ZBT-WR8305RT.dts b/target/linux/ramips/dts/ZBT-WR8305RT.dts
index 528609097..c9a3676ed 100644
--- a/target/linux/ramips/dts/ZBT-WR8305RT.dts
+++ b/target/linux/ramips/dts/ZBT-WR8305RT.dts
@@ -10,7 +10,10 @@
 	model = "Zbtlink ZBT-WR8305RT";
 
 	aliases {
-		led-status = &led_sys;
+		led-boot = &led_sys;
+		led-failsafe = &led_sys;
+		led-running = &led_sys;
+		led-upgrade = &led_sys;
 	};
 
 	gpio-leds {
@@ -24,6 +27,8 @@
 		lan {
 			label = "zbt-wr8305rt:green:usb";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wifi {
diff --git a/target/linux/ramips/dts/ZL5900V2.dts b/target/linux/ramips/dts/ZL5900V2.dts
index 9480e59b8..3f85af00a 100644
--- a/target/linux/ramips/dts/ZL5900V2.dts
+++ b/target/linux/ramips/dts/ZL5900V2.dts
@@ -10,7 +10,10 @@
 	model = "Zorlik ZL5900V2";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/ZTE-Q7.dts b/target/linux/ramips/dts/ZTE-Q7.dts
index ffeee7ad2..3d28d76a1 100644
--- a/target/linux/ramips/dts/ZTE-Q7.dts
+++ b/target/linux/ramips/dts/ZTE-Q7.dts
@@ -10,7 +10,10 @@
 	model = "ZTE Q7";
 
 	aliases {
-		led-status = &led_status_blue;
+		led-boot = &led_status_blue;
+		led-failsafe = &led_status_blue;
+		led-running = &led_status_blue;
+		led-upgrade = &led_status_blue;
 	};
 
 	gpio-leds {
diff --git a/target/linux/ramips/dts/elecom_wrc-gst.dtsi b/target/linux/ramips/dts/elecom_wrc-gst.dtsi
index 6c52c1c00..92f033c2c 100644
--- a/target/linux/ramips/dts/elecom_wrc-gst.dtsi
+++ b/target/linux/ramips/dts/elecom_wrc-gst.dtsi
@@ -7,7 +7,10 @@
 
 / {
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	memory@0 {
diff --git a/target/linux/ramips/dts/ki_rb.dts b/target/linux/ramips/dts/ki_rb.dts
index ea4b06077..5e47a5540 100644
--- a/target/linux/ramips/dts/ki_rb.dts
+++ b/target/linux/ramips/dts/ki_rb.dts
@@ -10,7 +10,10 @@
 	model = "ZyXEL Keenetic Extra II";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	memory@0 {
@@ -67,6 +70,8 @@
 		usb {
 			label = "keenetic-extra-ii:green:usb";
 			gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 	};
 
diff --git a/target/linux/ramips/dts/kn.dts b/target/linux/ramips/dts/kn.dts
index eccd52a99..8f00e0edb 100644
--- a/target/linux/ramips/dts/kn.dts
+++ b/target/linux/ramips/dts/kn.dts
@@ -10,7 +10,10 @@
 	model = "ZyXEL Keenetic";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	cfi@1f000000 {
@@ -60,6 +63,8 @@
 		usb {
 			label = "kn:green:usb";
 			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&otg_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wps {
diff --git a/target/linux/ramips/dts/kn_rc.dts b/target/linux/ramips/dts/kn_rc.dts
index 461e726fe..cdb6f032c 100644
--- a/target/linux/ramips/dts/kn_rc.dts
+++ b/target/linux/ramips/dts/kn_rc.dts
@@ -10,7 +10,10 @@
 	model = "ZyXEL Keenetic Omni";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
@@ -24,6 +27,8 @@
 		usb {
 			label = "kn_rc:green:usb";
 			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wifi {
diff --git a/target/linux/ramips/dts/kn_rf.dts b/target/linux/ramips/dts/kn_rf.dts
index 184cbd238..0f40d990a 100644
--- a/target/linux/ramips/dts/kn_rf.dts
+++ b/target/linux/ramips/dts/kn_rf.dts
@@ -10,7 +10,10 @@
 	model = "ZyXEL Keenetic Omni II";
 
 	aliases {
-		led-status = &led_power;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
 	};
 
 	gpio-leds {
@@ -24,6 +27,8 @@
 		usb {
 			label = "kn_rc:green:usb";
 			gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		wifi {
diff --git a/target/linux/ramips/dts/kng_rc.dts b/target/linux/ramips/dts/kng_rc.dts
index 2aea16c21..0655f3734 100644
--- a/target/linux/ramips/dts/kng_rc.dts
+++ b/target/linux/ramips/dts/kng_rc.dts
@@ -10,7 +10,10 @@
 	model = "ZyXEL Keenetic Viva";
 
 	aliases {
-		led-status = &led_power_green;
+		led-boot = &led_power_green;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_power_green;
 	};
 
 	gpio-leds {
@@ -24,6 +27,8 @@
 		usb {
 			label = "kng_rc:green:usb";
 			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ohci_port1>, <&ehci_port1>;
+			linux,default-trigger = "usbport";
 		};
 
 		power_alert {
diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi
index a242684fd..2d6ec4937 100644
--- a/target/linux/ramips/dts/mt7620a.dtsi
+++ b/target/linux/ramips/dts/mt7620a.dtsi
@@ -510,6 +510,8 @@
 	};
 
 	ehci: ehci@101c0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ehci";
 		reg = <0x101c0000 0x1000>;
 
@@ -520,9 +522,16 @@
 		phy-names = "usb";
 
 		status = "disabled";
+
+		ehci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 
 	ohci: ohci@101c1000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ohci";
 		reg = <0x101c1000 0x1000>;
 
@@ -533,6 +542,11 @@
 		phy-names = "usb";
 
 		status = "disabled";
+
+		ohci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 
 	pcie: pcie@10140000 {
diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi
index 1a72e98f0..7fa15a6ce 100644
--- a/target/linux/ramips/dts/mt7620n.dtsi
+++ b/target/linux/ramips/dts/mt7620n.dtsi
@@ -349,6 +349,8 @@
 	};
 
 	ehci: ehci@101c0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ehci";
 		reg = <0x101c0000 0x1000>;
 
@@ -359,9 +361,16 @@
 		phy-names = "usb";
 
 		status = "disabled";
+
+		ehci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 
 	ohci: ohci@101c1000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ohci";
 		reg = <0x101c1000 0x1000>;
 
@@ -372,6 +381,11 @@
 		interrupts = <18>;
 
 		status = "disabled";
+
+		ohci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 
 	wmac: wmac@10180000 {
diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index f3f47cdc9..aa85aee6c 100644
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -347,6 +347,8 @@
 	};
 
 	xhci: xhci@1E1C0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		status = "okay";
 
 		compatible = "mediatek,mt8173-xhci";
@@ -359,6 +361,25 @@
 
 		interrupt-parent = <&gic>;
 		interrupts = <GIC_SHARED 22 IRQ_TYPE_LEVEL_HIGH>;
+
+		/*
+		 * Port 1 of both hubs is one usb slot and referenced here.
+		 * The binding doesn't allow to address individual hubs.
+		 * hub 1 - port 1 is ehci and ohci, hub 2 - port 1 is xhci.
+		 */
+		xhci_ehci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
+
+		/*
+		 * Only the second usb hub has a second port. That port serves
+		 * ehci and ohci.
+		 */
+		ehci_port2: port@2 {
+			reg = <2>;
+			#trigger-source-cells = <0>;
+		};
 	};
 
 	gic: interrupt-controller@1fbc0000 {
diff --git a/target/linux/ramips/dts/mt7628an.dtsi b/target/linux/ramips/dts/mt7628an.dtsi
index 43e201699..b8a8bb910 100644
--- a/target/linux/ramips/dts/mt7628an.dtsi
+++ b/target/linux/ramips/dts/mt7628an.dtsi
@@ -402,6 +402,8 @@
 	};
 
 	ehci: ehci@101c0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ehci";
 		reg = <0x101c0000 0x1000>;
 
@@ -410,9 +412,16 @@
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
+
+		ehci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 
 	ohci: ohci@101c1000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ohci";
 		reg = <0x101c1000 0x1000>;
 
@@ -421,6 +430,11 @@
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
+
+		ohci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 
 	ethernet: ethernet@10100000 {
diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi
index 75f1229c9..40b1b2126 100644
--- a/target/linux/ramips/dts/rt3050.dtsi
+++ b/target/linux/ramips/dts/rt3050.dtsi
@@ -335,6 +335,8 @@
 	};
 
 	otg: otg@101c0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "ralink,rt3050-otg", "snps,dwc2";
 		reg = <0x101c0000 0x40000>;
 
@@ -345,5 +347,10 @@
 		reset-names = "otg";
 
 		status = "disabled";
+
+		otg_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 };
diff --git a/target/linux/ramips/dts/rt3352.dtsi b/target/linux/ramips/dts/rt3352.dtsi
index a609afd73..547de2cb4 100644
--- a/target/linux/ramips/dts/rt3352.dtsi
+++ b/target/linux/ramips/dts/rt3352.dtsi
@@ -358,6 +358,8 @@
 	};
 
 	ehci: ehci@101c0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ehci";
 		reg = <0x101c0000 0x1000>;
 
@@ -368,9 +370,16 @@
 		interrupts = <18>;
 
 		status = "disabled";
+
+		ehci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 
 	ohci: ohci@101c1000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ohci";
 		reg = <0x101c1000 0x1000>;
 
@@ -381,5 +390,10 @@
 		interrupts = <18>;
 
 		status = "disabled";
+
+		ohci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 };
diff --git a/target/linux/ramips/dts/rt3883.dtsi b/target/linux/ramips/dts/rt3883.dtsi
index 2a62327d8..ce71c915c 100644
--- a/target/linux/ramips/dts/rt3883.dtsi
+++ b/target/linux/ramips/dts/rt3883.dtsi
@@ -456,6 +456,8 @@
 	};
 
 	ehci: ehci@101c0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ehci";
 		reg = <0x101c0000 0x1000>;
 
@@ -466,9 +468,16 @@
 		interrupts = <18>;
 
 		status = "disabled";
+
+		ehci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 
 	ohci: ohci@101c1000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ohci";
 		reg = <0x101c1000 0x1000>;
 
@@ -479,5 +488,10 @@
 		interrupts = <18>;
 
 		status = "disabled";
+
+		ohci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 };
diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi
index f14162a58..1cc35f12a 100644
--- a/target/linux/ramips/dts/rt5350.dtsi
+++ b/target/linux/ramips/dts/rt5350.dtsi
@@ -372,6 +372,8 @@
 	};
 
 	ehci: ehci@101c0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ehci";
 		reg = <0x101c0000 0x1000>;
 
@@ -380,9 +382,16 @@
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
+
+		ehci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 
 	ohci: ohci@101c1000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
 		compatible = "generic-ohci";
 		reg = <0x101c1000 0x1000>;
 
@@ -391,5 +400,10 @@
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
+
+		ohci_port1: port@1 {
+			reg = <1>;
+			#trigger-source-cells = <0>;
+		};
 	};
 };
diff --git a/target/linux/ramips/mt7620/config-4.14 b/target/linux/ramips/mt7620/config-4.14
index bc68005cc..7d0391079 100644
--- a/target/linux/ramips/mt7620/config-4.14
+++ b/target/linux/ramips/mt7620/config-4.14
@@ -233,4 +233,4 @@ CONFIG_TINY_SRCU=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 CONFIG_WATCHDOG_CORE=y
-CONFIG_MIPS_FPU_EMULATOR=y
+CONFIG_MIPS_FPU_EMULATOR=y
\ No newline at end of file
diff --git a/target/linux/ramips/mt7620/config-4.9 b/target/linux/ramips/mt7620/config-4.9
index 8c9bddef6..d6678771a 100644
--- a/target/linux/ramips/mt7620/config-4.9
+++ b/target/linux/ramips/mt7620/config-4.9
@@ -126,6 +126,7 @@ CONFIG_MIPS_CLOCK_VSYSCALL=y
 # CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER is not set
 CONFIG_MIPS_CMDLINE_FROM_DTB=y
 # CONFIG_MIPS_ELF_APPENDED_DTB is not set
+CONFIG_MIPS_FPU_EMULATOR=y
 # CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
@@ -213,4 +214,3 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 CONFIG_WATCHDOG_CORE=y
-CONFIG_MIPS_FPU_EMULATOR=y
diff --git a/target/linux/ramips/mt76x8/config-4.14 b/target/linux/ramips/mt76x8/config-4.14
index 81e084893..c9c9abcab 100644
--- a/target/linux/ramips/mt76x8/config-4.14
+++ b/target/linux/ramips/mt76x8/config-4.14
@@ -228,3 +228,4 @@ CONFIG_TINY_SRCU=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 CONFIG_WATCHDOG_CORE=y
+CONFIG_MIPS_FPU_EMULATOR=y
diff --git a/target/linux/ramips/patches-4.14/0002-MIPS-pci-rt2880-set-pci-controller-of_node.patch b/target/linux/ramips/patches-4.14/0002-MIPS-pci-rt2880-set-pci-controller-of_node.patch
new file mode 100644
index 000000000..7ac092cfb
--- /dev/null
+++ b/target/linux/ramips/patches-4.14/0002-MIPS-pci-rt2880-set-pci-controller-of_node.patch
@@ -0,0 +1,32 @@
+From 0eb1cfffd5433d8dce3e4163a5cd9accc6000856 Mon Sep 17 00:00:00 2001
+From: Tobias Wolf <dev-NTEO@vplace.de>
+Date: Wed, 5 Sep 2018 08:51:26 +0200
+Subject: [PATCH] MIPS: pci-rt2880: set pci controller of_node
+
+Set the PCI controller of_node such that PCI devices can be
+instantiated via device tree.
+
+Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
+Signed-off-by: Mathias Kresin <dev@kresin.me>
+Acked-by: John Crispin <john@phrozen.org>
+Signed-off-by: Paul Burton <paul.burton@mips.com>
+Patchwork: https://patchwork.linux-mips.org/patch/20423/
+Cc: Ralf Baechle <ralf@linux-mips.org>
+Cc: James Hogan <jhogan@kernel.org>
+Cc: linux-mips@linux-mips.org
+Cc: linux-kernel@vger.kernel.org
+---
+ arch/mips/pci/pci-rt2880.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/mips/pci/pci-rt2880.c
++++ b/arch/mips/pci/pci-rt2880.c
+@@ -246,6 +246,8 @@ static int rt288x_pci_probe(struct platf
+ 	rt2880_pci_write_u32(PCI_BASE_ADDRESS_0, 0x08000000);
+ 	(void) rt2880_pci_read_u32(PCI_BASE_ADDRESS_0);
+ 
++	rt2880_pci_controller.of_node = pdev->dev.of_node;
++
+ 	register_pci_controller(&rt2880_pci_controller);
+ 	return 0;
+ }