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>
This commit is contained in:
Mathias Kresin
2018-08-13 17:14:08 +02:00
parent fa3c2676ab
commit a58535771f
70 changed files with 235 additions and 80 deletions

View 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";
};
};
};

View 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";
};
};

View 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";
};
};

View 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 {

View 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";
};
};

View 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 {

View 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 {

View 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 {

View 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";

View 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 {

View 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 {

View File

@@ -51,6 +51,8 @@
usb {
label = "bc2:blue:usb";
gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
trigger-sources = <&otg_port1>;
linux,default-trigger = "usbport";
};
};

View 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";
};
};

View 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 {

View 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";
};
};
};

View File

@@ -60,6 +60,8 @@
usb {
label = "d105:green:usb";
gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
trigger-sources = <&otg_port1>;
linux,default-trigger = "usbport";
};
};

View 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 {

View 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";
};
};

View 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";
};
};
};

View 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 {

View File

@@ -65,6 +65,8 @@
usb {
label = "fonera20n:orange:usb";
gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
trigger-sources = <&otg_port1>;
linux,default-trigger = "usbport";
};
};

View 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 {

View 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 {

View 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";
};
};

View 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 {

View 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 {

View 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 {

View 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";
};
};

View 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 {

View 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";
};
};

View 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";
};

View 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";
};
};
};

View 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 {

View 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 {

View 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 {

View 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>;
@@ -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";
};
};

View 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";
};
};

View 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 {

View 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 {

View 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 {

View 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 {

View 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 {

View 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 {

View 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";
};
};
};

View 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";
};
};
};

View 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 {

View 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 {

View 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 {

View 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 {

View 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";
};
};

View 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 {

View 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 {

View 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";

View 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 {

View 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";

View 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 {

View 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";
};
};

View 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 {

View 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 {

View 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 {

View 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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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>;
};
};
};

View File

@@ -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>;
};
};
};

View File

@@ -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>;
};
};
};

View File

@@ -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>;
};
};
};