ramips: set usb led trigger via devicetree

Assign the usbdev trigger via devicetree for all subtargets and drop
the userspace handling of the usb leds.

With the change all usb ports are triggering the usb led instead of
only usb 1.1 XOR usb 2.0 XOR usb 3.0 as it was before.

Signed-off-by: Mathias Kresin <dev@kresin.me>

70 files changed, 235 insertions, 80 deletions

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 293e91ea216..4935d145375 100755
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -17,24 +17,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,7 +34,6 @@ 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"
@@ -76,13 +59,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 +70,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"
 	;;
@@ -108,14 +84,9 @@ cf-wr800n)
 	;;
 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,7 +121,6 @@ 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)
@@ -163,7 +133,6 @@ dir-860l-b1)
 	;;
 edimax,br-6478ac-v2)
 	set_wifi_led "$boardname:blue:wlan"
-	set_usb_led "$boardname:blue:usb"
 	;;
 ex2700|\
 wn3000rpv3)
@@ -178,11 +147,7 @@ f5d8235-v1)
 	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 +180,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 +199,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 +223,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"
@@ -278,7 +239,6 @@ mpr-a2)
 	;;
 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 +248,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 +270,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 +287,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 +297,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 +324,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 +347,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,7 +370,6 @@ 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|\
@@ -446,16 +384,11 @@ 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,20 +401,17 @@ 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)
@@ -494,7 +424,6 @@ zbt-cpe102)
 	;;
 zbt-wa05)
 	set_wifi_led "$boardname:blue:air"
-	set_usb_led "$boardname:blue:usb"
 	;;
 zbt-we2026)
 	set_wifi_led "$boardname:green:wlan"
@@ -502,7 +431,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,7 +439,6 @@ 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)
@@ -522,12 +449,10 @@ zte-q7)
 	;;
 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/dts/11ACNAS.dts b/target/linux/ramips/dts/11ACNAS.dts
index f66bee6363a..6516bb0c13a 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 88ee81dfaf9..678c0eec4bf 100644
--- a/target/linux/ramips/dts/3G-6200N.dts
+++ b/target/linux/ramips/dts/3G-6200N.dts
@@ -71,6 +71,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/3G150B.dts b/target/linux/ramips/dts/3G150B.dts
index 90a52fa8bcc..533070089ca 100644
--- a/target/linux/ramips/dts/3G150B.dts
+++ b/target/linux/ramips/dts/3G150B.dts
@@ -24,6 +24,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 8d55020e74a..3e377e3afe6 100644
--- a/target/linux/ramips/dts/3G300M.dts
+++ b/target/linux/ramips/dts/3G300M.dts
@@ -39,6 +39,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/AIR3GII.dts b/target/linux/ramips/dts/AIR3GII.dts
index c3ce087ed2d..eb7cd0f1cae 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 305fe6e2618..840ec7851c3 100644
--- a/target/linux/ramips/dts/ALL0239-3G.dts
+++ b/target/linux/ramips/dts/ALL0239-3G.dts
@@ -56,6 +56,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/ASL26555.dtsi b/target/linux/ramips/dts/ASL26555.dtsi
index 890a7de1872..d1a5da9c204 100644
--- a/target/linux/ramips/dts/ASL26555.dtsi
+++ b/target/linux/ramips/dts/ASL26555.dtsi
@@ -63,6 +63,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/ArcherC2-v1.dts b/target/linux/ramips/dts/ArcherC2-v1.dts
index cc0d46a6b77..64b7997349c 100644
--- a/target/linux/ramips/dts/ArcherC2-v1.dts
+++ b/target/linux/ramips/dts/ArcherC2-v1.dts
@@ -37,6 +37,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 edaa76e3dd0..b44c161fa1c 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 70c6f84300d..2ec948bc541 100644
--- a/target/linux/ramips/dts/ArcherC20v1.dts
+++ b/target/linux/ramips/dts/ArcherC20v1.dts
@@ -34,6 +34,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/ArcherC50.dts b/target/linux/ramips/dts/ArcherC50.dts
index efcb17094e3..8fc8bde984d 100644
--- a/target/linux/ramips/dts/ArcherC50.dts
+++ b/target/linux/ramips/dts/ArcherC50.dts
@@ -34,6 +34,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/BC2.dts b/target/linux/ramips/dts/BC2.dts
index c57e79e5349..1143497b694 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-6478AC-V2.dts b/target/linux/ramips/dts/BR-6478AC-V2.dts
index b38be1e2c27..00de0d9c473 100644
--- a/target/linux/ramips/dts/BR-6478AC-V2.dts
+++ b/target/linux/ramips/dts/BR-6478AC-V2.dts
@@ -59,6 +59,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 a5664fe7976..b3382cd16d4 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/CY-SWR1100.dts b/target/linux/ramips/dts/CY-SWR1100.dts
index 787667a6ec7..b9f12f10689 100644
--- a/target/linux/ramips/dts/CY-SWR1100.dts
+++ b/target/linux/ramips/dts/CY-SWR1100.dts
@@ -94,6 +94,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 89cde124bea..676d68c1166 100644
--- a/target/linux/ramips/dts/D105.dts
+++ b/target/linux/ramips/dts/D105.dts
@@ -60,6 +60,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 613a20f9953..59183df4d7d 100644
--- a/target/linux/ramips/dts/D240.dts
+++ b/target/linux/ramips/dts/D240.dts
@@ -78,6 +78,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/DWR-118-A2.dts b/target/linux/ramips/dts/DWR-118-A2.dts
index fd8f932412c..5582a49bf7b 100644
--- a/target/linux/ramips/dts/DWR-118-A2.dts
+++ b/target/linux/ramips/dts/DWR-118-A2.dts
@@ -56,6 +56,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/EW1200.dts b/target/linux/ramips/dts/EW1200.dts
index b7b15137ec7..99bbf8c8f08 100644
--- a/target/linux/ramips/dts/EW1200.dts
+++ b/target/linux/ramips/dts/EW1200.dts
@@ -50,6 +50,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/F5D8235_V2.dts b/target/linux/ramips/dts/F5D8235_V2.dts
index f075dff4969..c7fb55f46ca 100644
--- a/target/linux/ramips/dts/F5D8235_V2.dts
+++ b/target/linux/ramips/dts/F5D8235_V2.dts
@@ -84,6 +84,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/FONERA20N.dts b/target/linux/ramips/dts/FONERA20N.dts
index 17bf4a83f75..2ff29d9a2e0 100644
--- a/target/linux/ramips/dts/FONERA20N.dts
+++ b/target/linux/ramips/dts/FONERA20N.dts
@@ -65,6 +65,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/HG255D.dts b/target/linux/ramips/dts/HG255D.dts
index 0e4ad421e41..242d04d2cde 100644
--- a/target/linux/ramips/dts/HG255D.dts
+++ b/target/linux/ramips/dts/HG255D.dts
@@ -76,6 +76,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/HW550-3G.dts b/target/linux/ramips/dts/HW550-3G.dts
index 1b589b5f60c..385ec343bb4 100644
--- a/target/linux/ramips/dts/HW550-3G.dts
+++ b/target/linux/ramips/dts/HW550-3G.dts
@@ -55,6 +55,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/MINIEMBPLUG.dts b/target/linux/ramips/dts/MINIEMBPLUG.dts
index 94d6b410fcd..00d057d2973 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/MOFI3500-3GN.dts b/target/linux/ramips/dts/MOFI3500-3GN.dts
index 345c028d02d..bfd20d20148 100644
--- a/target/linux/ramips/dts/MOFI3500-3GN.dts
+++ b/target/linux/ramips/dts/MOFI3500-3GN.dts
@@ -55,6 +55,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/MR-102N.dts b/target/linux/ramips/dts/MR-102N.dts
index c278b9cb919..13cec1b3777 100644
--- a/target/linux/ramips/dts/MR-102N.dts
+++ b/target/linux/ramips/dts/MR-102N.dts
@@ -65,6 +65,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/NA930.dts b/target/linux/ramips/dts/NA930.dts
index fadb484f390..7dd4d1b234f 100644
--- a/target/linux/ramips/dts/NA930.dts
+++ b/target/linux/ramips/dts/NA930.dts
@@ -84,6 +84,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-419N2.dts b/target/linux/ramips/dts/NBG-419N2.dts
index 151da148472..213db93159b 100644
--- a/target/linux/ramips/dts/NBG-419N2.dts
+++ b/target/linux/ramips/dts/NBG-419N2.dts
@@ -69,6 +69,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 c87a8d3cfb2..1c9d14384b8 100644
--- a/target/linux/ramips/dts/NW718.dts
+++ b/target/linux/ramips/dts/NW718.dts
@@ -24,6 +24,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-D2.dts b/target/linux/ramips/dts/Newifi-D2.dts
index f9c5ca8da5b..cf9b9f3a146 100644
--- a/target/linux/ramips/dts/Newifi-D2.dts
+++ b/target/linux/ramips/dts/Newifi-D2.dts
@@ -58,6 +58,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/PBR-D1.dts b/target/linux/ramips/dts/PBR-D1.dts
index 01ac2a12772..038978bc682 100644
--- a/target/linux/ramips/dts/PBR-D1.dts
+++ b/target/linux/ramips/dts/PBR-D1.dts
@@ -32,6 +32,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/PX-4885.dtsi b/target/linux/ramips/dts/PX-4885.dtsi
index 64e007adc67..3bd4d47bf41 100644
--- a/target/linux/ramips/dts/PX-4885.dtsi
+++ b/target/linux/ramips/dts/PX-4885.dtsi
@@ -32,6 +32,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/R6220.dts b/target/linux/ramips/dts/R6220.dts
index 83ba4531d50..bf789287c8e 100644
--- a/target/linux/ramips/dts/R6220.dts
+++ b/target/linux/ramips/dts/R6220.dts
@@ -33,6 +33,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/RT-AC51U.dts b/target/linux/ramips/dts/RT-AC51U.dts
index 7281bc9ce38..976a9c478be 100644
--- a/target/linux/ramips/dts/RT-AC51U.dts
+++ b/target/linux/ramips/dts/RT-AC51U.dts
@@ -24,6 +24,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-N14U.dts b/target/linux/ramips/dts/RT-N14U.dts
index 3a72026a2a0..51fae090f41 100644
--- a/target/linux/ramips/dts/RT-N14U.dts
+++ b/target/linux/ramips/dts/RT-N14U.dts
@@ -29,6 +29,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/SAP-G3200U3.dts b/target/linux/ramips/dts/SAP-G3200U3.dts
index 4ca5e889dec..353bae59719 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 7cbd205acc5..0216229c5eb 100644
--- a/target/linux/ramips/dts/SK-WB8.dts
+++ b/target/linux/ramips/dts/SK-WB8.dts
@@ -32,6 +32,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/TEW-714TRU.dts b/target/linux/ramips/dts/TEW-714TRU.dts
index 0fc798ee115..b9cb5ba774f 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 ed539b1d0e3..e81f0cbdb33 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 5bc1a82cc40..8bd26d6d359 100644
--- a/target/linux/ramips/dts/TL-MR3020V3.dts
+++ b/target/linux/ramips/dts/TL-MR3020V3.dts
@@ -57,6 +57,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 8845e8075bf..e2f90721ed1 100644
--- a/target/linux/ramips/dts/TL-MR3420V5.dts
+++ b/target/linux/ramips/dts/TL-MR3420V5.dts
@@ -46,6 +46,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-WR842NV5.dts b/target/linux/ramips/dts/TL-WR842NV5.dts
index c20e7806177..2d6307de729 100644
--- a/target/linux/ramips/dts/TL-WR842NV5.dts
+++ b/target/linux/ramips/dts/TL-WR842NV5.dts
@@ -46,6 +46,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 014c545e9e6..3490dc7b154 100644
--- a/target/linux/ramips/dts/TL-WR902ACV3.dts
+++ b/target/linux/ramips/dts/TL-WR902ACV3.dts
@@ -58,6 +58,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/U7628-01.dtsi b/target/linux/ramips/dts/U7628-01.dtsi
index f9f94be82fa..6de61a70856 100644
--- a/target/linux/ramips/dts/U7628-01.dtsi
+++ b/target/linux/ramips/dts/U7628-01.dtsi
@@ -99,6 +99,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/W2914NSV2.dts b/target/linux/ramips/dts/W2914NSV2.dts
index e1a9c416265..4c13122c115 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/W502U.dts b/target/linux/ramips/dts/W502U.dts
index 6b8775ef38f..9276ce87144 100644
--- a/target/linux/ramips/dts/W502U.dts
+++ b/target/linux/ramips/dts/W502U.dts
@@ -59,6 +59,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/WCR150GN.dts b/target/linux/ramips/dts/WCR150GN.dts
index 93c7c54932c..f67aef3ada1 100644
--- a/target/linux/ramips/dts/WCR150GN.dts
+++ b/target/linux/ramips/dts/WCR150GN.dts
@@ -55,6 +55,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 f82c4b94b13..e6c4b8c1b69 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 17011b1e393..ac3ce708870 100644
--- a/target/linux/ramips/dts/WF-2881.dts
+++ b/target/linux/ramips/dts/WF-2881.dts
@@ -28,6 +28,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/WR1200JS.dts b/target/linux/ramips/dts/WR1200JS.dts
index f7916486410..43ec413300c 100644
--- a/target/linux/ramips/dts/WR1200JS.dts
+++ b/target/linux/ramips/dts/WR1200JS.dts
@@ -38,6 +38,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/Y1.dts b/target/linux/ramips/dts/Y1.dts
index d9d00f082fc..1ce64daee00 100644
--- a/target/linux/ramips/dts/Y1.dts
+++ b/target/linux/ramips/dts/Y1.dts
@@ -31,6 +31,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 51bd10d75ab..c2f6c07c2a7 100644
--- a/target/linux/ramips/dts/Y1S.dts
+++ b/target/linux/ramips/dts/Y1S.dts
@@ -62,6 +62,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 5c0699e2eb3..3dda713e468 100644
--- a/target/linux/ramips/dts/YOUKU-YK1.dts
+++ b/target/linux/ramips/dts/YOUKU-YK1.dts
@@ -26,6 +26,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-WA05.dts b/target/linux/ramips/dts/ZBT-WA05.dts
index bd5bdb26b70..73b57ceddf2 100644
--- a/target/linux/ramips/dts/ZBT-WA05.dts
+++ b/target/linux/ramips/dts/ZBT-WA05.dts
@@ -28,6 +28,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-WE826.dtsi b/target/linux/ramips/dts/ZBT-WE826.dtsi
index 1210568ca9d..a46af063234 100644
--- a/target/linux/ramips/dts/ZBT-WE826.dtsi
+++ b/target/linux/ramips/dts/ZBT-WE826.dtsi
@@ -23,6 +23,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-WR8305RT.dts b/target/linux/ramips/dts/ZBT-WR8305RT.dts
index 52860909716..606154ea476 100644
--- a/target/linux/ramips/dts/ZBT-WR8305RT.dts
+++ b/target/linux/ramips/dts/ZBT-WR8305RT.dts
@@ -24,6 +24,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/ki_rb.dts b/target/linux/ramips/dts/ki_rb.dts
index ea4b060777c..bc4ba81b4a3 100644
--- a/target/linux/ramips/dts/ki_rb.dts
+++ b/target/linux/ramips/dts/ki_rb.dts
@@ -67,6 +67,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 eccd52a992e..da87444e12a 100644
--- a/target/linux/ramips/dts/kn.dts
+++ b/target/linux/ramips/dts/kn.dts
@@ -60,6 +60,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 461e726fe3d..8780dd77e55 100644
--- a/target/linux/ramips/dts/kn_rc.dts
+++ b/target/linux/ramips/dts/kn_rc.dts
@@ -24,6 +24,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 184cbd23868..eda44a4c5ce 100644
--- a/target/linux/ramips/dts/kn_rf.dts
+++ b/target/linux/ramips/dts/kn_rf.dts
@@ -24,6 +24,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 2aea16c21b2..325522ec903 100644
--- a/target/linux/ramips/dts/kng_rc.dts
+++ b/target/linux/ramips/dts/kng_rc.dts
@@ -24,6 +24,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 a242684fd89..2d6ec49370c 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 1a72e98f095..7fa15a6cefe 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 f3f47cdc922..aa85aee6cb3 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 43e201699e3..b8a8bb91033 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 75f1229c926..40b1b2126c7 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 a609afd73d7..547de2cb4c1 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 2a62327d80b..ce71c915c02 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 f14162a5885..1cc35f12a37 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>;
+		};
 	};
 };