Assign the usbdev trigger via devicetree and drop the userspace
handling of the usb leds.
Drop the now unused userspace helper code as well.
Signed-off-by: Mathias Kresin <dev@kresin.me>
Acked-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
+ #address-cells = <1>;
+ #size-cells = <0>;
status = "disabled";
compatible = "lantiq,xrx200-usb";
reg = <0xe101000 0x1000
status = "disabled";
compatible = "lantiq,xrx200-usb";
reg = <0xe101000 0x1000
dr_mode = "host";
phys = <&usb_phy0>;
phy-names = "usb2-phy";
dr_mode = "host";
phys = <&usb_phy0>;
phy-names = "usb2-phy";
+
+ ehci_port1: port@1 {
+ reg = <1>;
+ #trigger-source-cells = <0>;
+ };
+ #address-cells = <1>;
+ #size-cells = <0>;
status = "disabled";
compatible = "lantiq,xrx200-usb";
reg = <0xe106000 0x1000>;
status = "disabled";
compatible = "lantiq,xrx200-usb";
reg = <0xe106000 0x1000>;
dr_mode = "host";
phys = <&usb_phy1>;
phy-names = "usb2-phy";
dr_mode = "host";
phys = <&usb_phy1>;
phy-names = "usb2-phy";
+
+ ehci_port2: port@1 {
+ reg = <1>;
+ #trigger-source-cells = <0>;
+ };
led-failsafe = &power;
led-running = &power;
led-upgrade = &power;
led-failsafe = &power;
led-running = &power;
led-upgrade = &power;
-
- led-usb = &led_usb1;
- led-usb2 = &led_usb2;
label = "green:fxo";
gpios = <&stp 19 GPIO_ACTIVE_HIGH>;
};
label = "green:fxo";
gpios = <&stp 19 GPIO_ACTIVE_HIGH>;
};
label = "green:usb1";
gpios = <&stp 18 GPIO_ACTIVE_HIGH>;
label = "green:usb1";
gpios = <&stp 18 GPIO_ACTIVE_HIGH>;
+ trigger-sources = <&ehci_port1>;
+ linux,default-trigger = "usbport";
label = "green:usb2";
gpios = <&stp 15 GPIO_ACTIVE_HIGH>;
label = "green:usb2";
gpios = <&stp 15 GPIO_ACTIVE_HIGH>;
+ trigger-sources = <&ehci_port2>;
+ linux,default-trigger = "usbport";
};
sd {
label = "green:sd";
};
sd {
label = "green:sd";
led-dsl = &led_dsl;
led-internet = &led_internet;
led-wifi = &led_wifi;
led-dsl = &led_dsl;
led-internet = &led_internet;
led-wifi = &led_wifi;
- led-usb = &led_usb0;
- led-usb2 = &led_usb2;
gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
};
gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
};
label = "green:usb";
gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
label = "green:usb";
gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
+ trigger-sources = <&ehci_port1>;
+ linux,default-trigger = "usbport";
label = "green:usb2";
gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
label = "green:usb2";
gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
+ trigger-sources = <&ehci_port2>;
+ linux,default-trigger = "usbport";
led-dsl = &led_dsl;
led-internet = &led_internet;
led-wifi = &led_wlan5g;
led-dsl = &led_dsl;
led-internet = &led_internet;
led-wifi = &led_wlan5g;
-
- led-usb = &led_usb;
- led-usb2 = &led_usb;
gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
};
gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
};
label = "blue:usb";
gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
label = "blue:usb";
gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
+ trigger-sources = <&ehci_port1>, <&ehci_port2>;
+ linux,default-trigger = "usbport";
compatible = "zyxel,p-2812hnu-f1", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9";
model = "ZyXEL P-2812HNU-F1";
compatible = "zyxel,p-2812hnu-f1", "zyxel,p-2812hnu", "lantiq,xway", "lantiq,vr9";
model = "ZyXEL P-2812HNU-F1";
- aliases {
- led-usb = &led_usb1;
- led-usb2 = &led_usb2;
- };
-
label = "green:usb1";
gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
label = "green:usb1";
gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
+ trigger-sources = <&ehci_port1>;
+ linux,default-trigger = "usbport";
label = "green:usb2";
gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
label = "green:usb2";
gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
+ trigger-sources = <&ehci_port2>;
+ linux,default-trigger = "usbport";
led_wifi="$(get_dt_led wifi)"
[ -n "$led_wifi" ] && ucidef_set_led_wlan "wifi" "wifi" "$led_wifi" "phy0tpt"
led_wifi="$(get_dt_led wifi)"
[ -n "$led_wifi" ] && ucidef_set_led_wlan "wifi" "wifi" "$led_wifi" "phy0tpt"
-led_usb="$(get_dt_led usb)"
-[ -n "$led_usb" ] && ucidef_set_led_usbdev "usb" "usb" "$led_usb" "1-1"
-
-led_usb2="$(get_dt_led usb2)"
-[ -n "$led_usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "$led_usb2" "2-1"
-
led_dsl="$(get_dt_led dsl)"
[ -n "$led_dsl" ] && {
led_internet="$(get_dt_led internet)"
led_dsl="$(get_dt_led dsl)"
[ -n "$led_dsl" ] && {
led_internet="$(get_dt_led internet)"