From 772b27c207364f31f8b34b80a94647810fdb581c Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Fri, 17 Aug 2018 16:41:17 +0200 Subject: [PATCH] ramips: set F5D8235 v1 usb led trigger via devicetree Assign the usbdev trigger via devicetree and drop the userspace handling of the usb leds. Signed-off-by: Mathias Kresin --- .../ramips/base-files/etc/board.d/01_leds | 5 ---- target/linux/ramips/dts/F5D8235_V1.dts | 26 +++++++++++++++++++ 2 files changed, 26 insertions(+), 5 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 4935d14537..e45508ee2b 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -2,10 +2,6 @@ . /lib/functions/uci-defaults.sh -set_usb_led() { - ucidef_set_led_usbdev "usb" "USB" "${1}" "${2:-1-1}" -} - set_wifi_led() { ucidef_set_led_netdev "wifi_led" "wifi" "${1}" "${2:-wlan0}" } @@ -144,7 +140,6 @@ ex3700) ;; f5d8235-v1) ucidef_set_led_default "lan" "lan" "$boardname:blue:wired" "0" - set_usb_led "$boardname:blue:storage" set_wifi_led "$boardname:blue:wireless" ;; fonera20n) diff --git a/target/linux/ramips/dts/F5D8235_V1.dts b/target/linux/ramips/dts/F5D8235_V1.dts index f588c9fb21..0cb4084be7 100644 --- a/target/linux/ramips/dts/F5D8235_V1.dts +++ b/target/linux/ramips/dts/F5D8235_V1.dts @@ -146,6 +146,8 @@ storage { label = "f5d8235-v1:blue:storage"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + trigger-sources = <&ohci_port1>, <&ehci_port1>; + linux,default-trigger = "usbport"; }; storage2 { @@ -209,6 +211,30 @@ &pci { status = "okay"; + + usb@11,0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "pci1033,0035"; + reg = <0x8800 0 0 0 0>; + + ohci_port1: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; + }; + + usb@11,1 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "pci1033,00e0"; + reg = <0x8900 0 0 0 0>; + + ehci_port1: port@1 { + reg = <1>; + #trigger-source-cells = <0>; + }; + }; }; &wmac { -- 2.25.1