mvebu: fix usb port leds

All mvebu boards have three USB LEDs. The first one is used for the
USB1 port.

There are two LEDs related to the second USB port. The top (bar) LED
gets bright in case any USB device is connected to the second USB port.

If the connected device is an USB 3 (SuperSpeed) device, the small dot
LED bellow the "bar" LED gets also bright.

While at it, use a name for the USB LEDs that matches the names printed
on the case.

Fixes: FS#423, FS#425

Signed-off-by: Kabuli Chana <newtownbuild@gmail.com>
Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/mvebu/base-files/etc/board.d/01_leds b/target/linux/mvebu/base-files/etc/board.d/01_leds
index d6e42ddfd590ff8e6136bffafd0c57159f1cbb98..f4b72288fe122173c78e9ac5609c4c645d78437c 100755 (executable)
--- a/target/linux/mvebu/base-files/etc/board.d/01_leds
+++ b/target/linux/mvebu/base-files/etc/board.d/01_leds
@@ -14,28 +14,33 @@ board=$(mvebu_board_name)
 case "$board" in
 armada-385-linksys-caiman)
        ucidef_set_led_netdev "wan" "WAN" "pca963x:caiman:white:wan" "eth1"
-       ucidef_set_led_usbdev "usb2" "USB2" "pca963x:caiman:white:usb2" "1-1"
-       ucidef_set_led_usbdev "usb3" "USB3" "pca963x:caiman:white:usb3_1" "3-1"
+       ucidef_set_led_usbport "usb1" "USB 1" "pca963x:caiman:white:usb2" "usb1-port1"
+       ucidef_set_led_usbport "usb2" "USB 2" "pca963x:caiman:white:usb3_1" "usb2-port1" "usb3-port1"
+       ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:caiman:white:usb3_2" "usb3-port1"
        ;;
 armada-385-linksys-cobra)
        ucidef_set_led_netdev "wan" "WAN" "pca963x:cobra:white:wan" "eth1"
-       ucidef_set_led_usbdev "usb2" "USB2" "pca963x:cobra:white:usb2" "1-1"
-       ucidef_set_led_usbdev "usb3" "USB3" "pca963x:cobra:white:usb3_1" "3-1"
+       ucidef_set_led_usbport "usb1" "USB 1" "pca963x:cobra:white:usb2" "usb1-port1"
+       ucidef_set_led_usbport "usb2" "USB 2" "pca963x:cobra:white:usb3_1" "usb2-port1" "usb3-port1"
+       ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:cobra:white:usb3_2" "usb3-port1"
        ;;
 armada-385-linksys-rango)
        ucidef_set_led_netdev "wan" "WAN" "pca963x:rango:white:wan" "eth1"
-       ucidef_set_led_usbdev "usb2" "USB2" "pca963x:rango:white:usb2" "1-1"
-       ucidef_set_led_usbdev "usb3" "USB3" "pca963x:rango:white:usb3_1" "3-1"
+       ucidef_set_led_usbport "usb1" "USB 1" "pca963x:rango:white:usb2" "usb1-port1"
+       ucidef_set_led_usbport "usb2" "USB 2" "pca963x:rango:white:usb3_1" "usb2-port1" "usb3-port1"
+       ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:rango:white:usb3_2" "usb3-port1"
        ;;
 armada-385-linksys-shelby)
        ucidef_set_led_netdev "wan" "WAN" "pca963x:shelby:white:wan" "eth1"
-       ucidef_set_led_usbdev "usb2" "USB2" "pca963x:shelby:white:usb2" "1-1"
-       ucidef_set_led_usbdev "usb3" "USB3" "pca963x:shelby:white:usb3_1" "3-1"
+       ucidef_set_led_usbport "usb1" "USB 1" "pca963x:shelby:white:usb2" "usb1-port1"
+       ucidef_set_led_usbport "usb2" "USB 2" "pca963x:shelby:white:usb3_1" "usb2-port1" "usb3-port1"
+       ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:shelby:white:usb3_2" "usb3-port1"
        ;;
 armada-xp-linksys-mamba)
        ucidef_set_led_netdev "wan" "WAN" "mamba:white:wan" "eth1"
-       ucidef_set_led_usbdev "usb2" "USB2" "mamba:white:usb2" "1-1"
-       ucidef_set_led_usbdev "usb3" "USB3" "mamba:white:usb3_1" "2-2"
+       ucidef_set_led_usbport "usb1" "USB 1" "mamba:white:usb2" "usb1-port1"
+       ucidef_set_led_usbport "usb2" "USB 2" "mamba:white:usb3_1" "usb2-port1" "usb3-port1"
+       ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "mamba:white:usb3_2" "usb3-port2"
        ;;
 
 esac