ar71xx: ZyXEL NBG6716 led/buttons cleanup

ZyXEL NBG6716 led/buttons cleanup
 - improper numbered leds
 - improper named buttons

Signed-off-by: Marcin Mikolajczak <gr4ffy at gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44417 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index 69e8daa..a4838d6 100644 (file)
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -220,8 +220,8 @@ nbg6716)
        ucidef_set_led_netdev "wan" "WAN" "zyxel:white:internet" "eth1"
        ucidef_set_led_wlan "wlan" "WLAN" "zyxel:white:wifi2g" "phy1tpt"
        ucidef_set_led_wlan "wlan5" "WLAN5" "zyxel:white:wifi5g" "phy0tpt"
-       ucidef_set_led_usbdev "usb1" "USB1" "zyxel:white:usb0" "1-1"
-       ucidef_set_led_usbdev "usb2" "USB2" "zyxel:white:usb1" "2-1"
+       ucidef_set_led_usbdev "usb1" "USB1" "zyxel:white:usb1" "2-1"
+       ucidef_set_led_usbdev "usb2" "USB2" "zyxel:white:usb2" "1-1"
        ;;
 
 om2p | \

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
index afde87f..b27872f 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
@@ -43,16 +43,16 @@
 
 #define NBG6716_GPIO_LED_INTERNET      18
 #define NBG6716_GPIO_LED_POWER         15
-#define NBG6716_GPIO_LED_USB0          13
 #define NBG6716_GPIO_LED_USB1          4
+#define NBG6716_GPIO_LED_USB2          13
 #define NBG6716_GPIO_LED_WIFI2G                19
 #define NBG6716_GPIO_LED_WIFI5G                17
 #define NBG6716_GPIO_LED_WPS           21
 
 #define NBG6716_GPIO_BTN_RESET         23
 #define NBG6716_GPIO_BTN_RFKILL                1
-#define NBG6716_GPIO_BTN_USB0          14
 #define NBG6716_GPIO_BTN_USB1          0
+#define NBG6716_GPIO_BTN_USB2          14
 #define NBG6716_GPIO_BTN_WPS           22
 
 #define NBG6716_KEYS_POLL_INTERVAL     20      /* msecs */
@@ -75,13 +75,13 @@ static struct gpio_led nbg6716_leds_gpio[] __initdata = {
                .active_low     = 1,
        },
        {
-               .name           = "zyxel:white:usb0",
-               .gpio           = NBG6716_GPIO_LED_USB0,
+               .name           = "zyxel:white:usb1",
+               .gpio           = NBG6716_GPIO_LED_USB1,
                .active_low     = 1,
        },
        {
-               .name           = "zyxel:white:usb1",
-               .gpio           = NBG6716_GPIO_LED_USB1,
+               .name           = "zyxel:white:usb2",
+               .gpio           = NBG6716_GPIO_LED_USB2,
                .active_low     = 1,
        },
        {
@@ -119,19 +119,19 @@ static struct gpio_keys_button nbg6716_gpio_keys[] __initdata = {
                .active_low     = 1,
        },
        {
-               .desc           = "USB0 eject button",
+               .desc           = "USB1 eject button",
                .type           = EV_KEY,
-               .code           = BTN_0,
+               .code           = BTN_1,
                .debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
-               .gpio           = NBG6716_GPIO_BTN_USB0,
+               .gpio           = NBG6716_GPIO_BTN_USB1,
                .active_low     = 1,
        },
        {
-               .desc           = "USB1 eject button",
+               .desc           = "USB2 eject button",
                .type           = EV_KEY,
-               .code           = BTN_1,
+               .code           = BTN_2,
                .debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
-               .gpio           = NBG6716_GPIO_BTN_USB1,
+               .gpio           = NBG6716_GPIO_BTN_USB2,
                .active_low     = 1,
        },
        {