ramips: set usb led trigger via devicetree
authorMathias Kresin <dev@kresin.me>
Mon, 13 Aug 2018 15:14:08 +0000 (17:14 +0200)
committerMathias Kresin <dev@kresin.me>
Sun, 7 Oct 2018 09:34:18 +0000 (11:34 +0200)
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:
target/linux/ramips/base-files/etc/board.d/01_leds
target/linux/ramips/dts/11ACNAS.dts
target/linux/ramips/dts/3G-6200N.dts
target/linux/ramips/dts/3G150B.dts
target/linux/ramips/dts/3G300M.dts
target/linux/ramips/dts/AIR3GII.dts
target/linux/ramips/dts/ALL0239-3G.dts
target/linux/ramips/dts/ASL26555.dtsi
target/linux/ramips/dts/ArcherC2-v1.dts
target/linux/ramips/dts/ArcherC20i.dts
target/linux/ramips/dts/ArcherC20v1.dts
target/linux/ramips/dts/ArcherC50.dts
target/linux/ramips/dts/BC2.dts
target/linux/ramips/dts/BR-6478AC-V2.dts
target/linux/ramips/dts/BROADWAY.dts
target/linux/ramips/dts/CY-SWR1100.dts
target/linux/ramips/dts/D105.dts
target/linux/ramips/dts/D240.dts
target/linux/ramips/dts/DWR-118-A2.dts
target/linux/ramips/dts/EW1200.dts
target/linux/ramips/dts/F5D8235_V2.dts
target/linux/ramips/dts/FONERA20N.dts
target/linux/ramips/dts/HG255D.dts
target/linux/ramips/dts/HW550-3G.dts
target/linux/ramips/dts/MINIEMBPLUG.dts
target/linux/ramips/dts/MOFI3500-3GN.dts
target/linux/ramips/dts/MR-102N.dts
target/linux/ramips/dts/NA930.dts
target/linux/ramips/dts/NBG-419N2.dts
target/linux/ramips/dts/NW718.dts
target/linux/ramips/dts/Newifi-D2.dts
target/linux/ramips/dts/PBR-D1.dts
target/linux/ramips/dts/PX-4885.dtsi
target/linux/ramips/dts/R6220.dts
target/linux/ramips/dts/RT-AC51U.dts
target/linux/ramips/dts/RT-N14U.dts
target/linux/ramips/dts/SAP-G3200U3.dts
target/linux/ramips/dts/SK-WB8.dts
target/linux/ramips/dts/TEW-714TRU.dts
target/linux/ramips/dts/TINY-AC.dts
target/linux/ramips/dts/TL-MR3020V3.dts
target/linux/ramips/dts/TL-MR3420V5.dts
target/linux/ramips/dts/TL-WR842NV5.dts
target/linux/ramips/dts/TL-WR902ACV3.dts
target/linux/ramips/dts/U7628-01.dtsi
target/linux/ramips/dts/W2914NSV2.dts
target/linux/ramips/dts/W502U.dts
target/linux/ramips/dts/WCR150GN.dts
target/linux/ramips/dts/WE1026-5G.dtsi
target/linux/ramips/dts/WF-2881.dts
target/linux/ramips/dts/WR1200JS.dts
target/linux/ramips/dts/Y1.dts
target/linux/ramips/dts/Y1S.dts
target/linux/ramips/dts/YOUKU-YK1.dts
target/linux/ramips/dts/ZBT-WA05.dts
target/linux/ramips/dts/ZBT-WE826.dtsi
target/linux/ramips/dts/ZBT-WR8305RT.dts
target/linux/ramips/dts/ki_rb.dts
target/linux/ramips/dts/kn.dts
target/linux/ramips/dts/kn_rc.dts
target/linux/ramips/dts/kn_rf.dts
target/linux/ramips/dts/kng_rc.dts
target/linux/ramips/dts/mt7620a.dtsi
target/linux/ramips/dts/mt7620n.dtsi
target/linux/ramips/dts/mt7621.dtsi
target/linux/ramips/dts/mt7628an.dtsi
target/linux/ramips/dts/rt3050.dtsi
target/linux/ramips/dts/rt3352.dtsi
target/linux/ramips/dts/rt3883.dtsi
target/linux/ramips/dts/rt5350.dtsi

index 293e91e..4935d14 100755 (executable)
@@ -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
index f66bee6..6516bb0 100644 (file)
@@ -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";
                };
        };
 };
index 88ee81d..678c0ee 100644 (file)
@@ -71,6 +71,8 @@
                3g {
                        label = "3g-6200n:blue:3g";
                        gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&otg_port1>;
+                       linux,default-trigger = "usbport";
                };
        };
 
index 90a52fa..5330700 100644 (file)
@@ -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";
                };
        };
 
index 8d55020..3e377e3 100644 (file)
@@ -39,6 +39,8 @@
                3g {
                        label = "3g300m:blue:3g";
                        gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&otg_port1>;
+                       linux,default-trigger = "usbport";
                };
 
                wpsreset {
index c3ce087..eb7cd0f 100644 (file)
@@ -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";
                };
        };
 
index 305fe6e..840ec78 100644 (file)
@@ -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 {
index 890a7de..d1a5da9 100644 (file)
@@ -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 {
index cc0d46a..64b7997 100644 (file)
@@ -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 {
index edaa76e..b44c161 100644 (file)
@@ -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";
index 70c6f84..2ec948b 100644 (file)
@@ -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 {
index efcb170..8fc8bde 100644 (file)
@@ -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 {
index c57e79e..1143497 100644 (file)
@@ -51,6 +51,8 @@
                usb {
                        label = "bc2:blue:usb";
                        gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&otg_port1>;
+                       linux,default-trigger = "usbport";
                };
        };
 
index b38be1e..00de0d9 100644 (file)
@@ -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";
                };
        };
 
index a5664fe..b3382cd 100644 (file)
@@ -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 {
index 787667a..b9f12f1 100644 (file)
@@ -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";
                };
        };
 };
index 89cde12..676d68c 100644 (file)
@@ -60,6 +60,8 @@
                usb {
                        label = "d105:green:usb";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&otg_port1>;
+                       linux,default-trigger = "usbport";
                };
        };
 
index 613a20f..59183df 100644 (file)
@@ -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 {
index fd8f932..5582a49 100644 (file)
@@ -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";
                };
        };
 
index b7b1513..99bbf8c 100644 (file)
@@ -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";
                };
        };
 };
index f075dff..c7fb55f 100644 (file)
@@ -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 {
index 17bf4a8..2ff29d9 100644 (file)
@@ -65,6 +65,8 @@
                usb {
                        label = "fonera20n:orange:usb";
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&otg_port1>;
+                       linux,default-trigger = "usbport";
                };
        };
 
index 0e4ad42..242d04d 100644 (file)
@@ -76,6 +76,8 @@
                usb {
                        label = "hg255d:green:usb";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&otg_port1>;
+                       linux,default-trigger = "usbport";
                };
 
                wps {
index 1b589b5..385ec34 100644 (file)
@@ -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 {
index 94d6b41..00d057d 100644 (file)
@@ -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";
                };
        };
 
index 345c028..bfd20d2 100644 (file)
@@ -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 {
index c278b9c..13cec1b 100644 (file)
@@ -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 {
index fadb484..7dd4d1b 100644 (file)
@@ -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 {
index 151da14..213db93 100644 (file)
@@ -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";
                };
        };
 
index c87a8d3..1c9d143 100644 (file)
@@ -24,6 +24,8 @@
                usb {
                        label = "nw718:amber:usb";
                        gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&otg_port1>;
+                       linux,default-trigger = "usbport";
                };
 
                wps {
index f9c5ca8..cf9b9f3 100644 (file)
@@ -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";
                };
        };
 
index 01ac2a1..038978b 100644 (file)
@@ -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";
                };
 
index 64e007a..3bd4d47 100644 (file)
@@ -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";
                };
        };
 };
index 83ba453..bf78928 100644 (file)
@@ -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 {
index 7281bc9..976a9c4 100644 (file)
@@ -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 {
index 3a72026..51fae09 100644 (file)
@@ -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 {
index 4ca5e88..353bae5 100644 (file)
@@ -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>;
        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";
                };
        };
 
index 7cbd205..0216229 100644 (file)
@@ -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";
                };
        };
 
index 0fc798e..b9cb5ba 100644 (file)
@@ -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 {
index ed539b1..e81f0cb 100644 (file)
@@ -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 {
index 5bc1a82..8bd26d6 100644 (file)
@@ -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 {
index 8845e80..e2f9072 100644 (file)
@@ -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 {
index c20e780..2d6307d 100644 (file)
@@ -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 {
index 014c545..3490dc7 100644 (file)
@@ -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 {
index f9f94be..6de61a7 100644 (file)
@@ -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";
                };
        };
 };
index e1a9c41..4c13122 100644 (file)
@@ -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";
                };
        };
 };
index 6b8775e..9276ce8 100644 (file)
@@ -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 {
index 93c7c54..f67aef3 100644 (file)
@@ -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 {
index f82c4b9..e6c4b8c 100644 (file)
@@ -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 {
index 17011b1..ac3ce70 100644 (file)
@@ -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 {
index f791648..43ec413 100644 (file)
@@ -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";
                };
        };
 
index d9d00f0..1ce64da 100644 (file)
@@ -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 {
index 51bd10d..c2f6c07 100644 (file)
@@ -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 {
index 5c0699e..3dda713 100644 (file)
@@ -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";
index bd5bdb2..73b57ce 100644 (file)
@@ -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 {
index 1210568..a46af06 100644 (file)
@@ -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";
index 5286090..606154e 100644 (file)
@@ -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 {
index ea4b060..bc4ba81 100644 (file)
@@ -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";
                };
        };
 
index eccd52a..da87444 100644 (file)
@@ -60,6 +60,8 @@
                usb {
                        label = "kn:green:usb";
                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&otg_port1>;
+                       linux,default-trigger = "usbport";
                };
 
                wps {
index 461e726..8780dd7 100644 (file)
@@ -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 {
index 184cbd2..eda44a4 100644 (file)
@@ -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 {
index 2aea16c..325522e 100644 (file)
@@ -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 {
index a242684..2d6ec49 100644 (file)
        };
 
        ehci: ehci@101c0000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
                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>;
 
                phy-names = "usb";
 
                status = "disabled";
+
+               ohci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 
        pcie: pcie@10140000 {
index 1a72e98..7fa15a6 100644 (file)
        };
 
        ehci: ehci@101c0000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
                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>;
 
                interrupts = <18>;
 
                status = "disabled";
+
+               ohci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 
        wmac: wmac@10180000 {
index f3f47cd..aa85aee 100644 (file)
        };
 
        xhci: xhci@1E1C0000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                status = "okay";
 
                compatible = "mediatek,mt8173-xhci";
 
                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 {
index 43e2016..b8a8bb9 100644 (file)
        };
 
        ehci: ehci@101c0000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
 
                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>;
 
 
                interrupt-parent = <&intc>;
                interrupts = <18>;
+
+               ohci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 
        ethernet: ethernet@10100000 {
index 75f1229..40b1b21 100644 (file)
        };
 
        otg: otg@101c0000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "ralink,rt3050-otg", "snps,dwc2";
                reg = <0x101c0000 0x40000>;
 
                reset-names = "otg";
 
                status = "disabled";
+
+               otg_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 };
index a609afd..547de2c 100644 (file)
        };
 
        ehci: ehci@101c0000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
                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>;
 
                interrupts = <18>;
 
                status = "disabled";
+
+               ohci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 };
index 2a62327..ce71c91 100644 (file)
        };
 
        ehci: ehci@101c0000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
                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>;
 
                interrupts = <18>;
 
                status = "disabled";
+
+               ohci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 };
index f14162a..1cc35f1 100644 (file)
        };
 
        ehci: ehci@101c0000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "generic-ehci";
                reg = <0x101c0000 0x1000>;
 
 
                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>;
 
 
                interrupt-parent = <&intc>;
                interrupts = <18>;
+
+               ohci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
        };
 };