From de8d6e447c813af2b6e9870979aa0642b02b5198 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Thu, 12 Feb 2015 08:07:27 +0000
Subject: [PATCH] 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>

SVN-Revision: 44417
---
 .../base-files/etc/uci-defaults/01_leds       |  4 +--
 .../files/arch/mips/ath79/mach-nbg6716.c      | 28 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

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 69e8daac85..a4838d6474 100644
--- 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 afde87f9d9..b27872f410 100644
--- 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,
 	},
 	{
@@ -118,14 +118,6 @@ static struct gpio_keys_button nbg6716_gpio_keys[] __initdata = {
 		.gpio		= NBG6716_GPIO_BTN_RFKILL,
 		.active_low	= 1,
 	},
-	{
-		.desc		= "USB0 eject button",
-		.type		= EV_KEY,
-		.code		= BTN_0,
-		.debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
-		.gpio		= NBG6716_GPIO_BTN_USB0,
-		.active_low	= 1,
-	},
 	{
 		.desc		= "USB1 eject button",
 		.type		= EV_KEY,
@@ -134,6 +126,14 @@ static struct gpio_keys_button nbg6716_gpio_keys[] __initdata = {
 		.gpio		= NBG6716_GPIO_BTN_USB1,
 		.active_low	= 1,
 	},
+	{
+		.desc		= "USB2 eject button",
+		.type		= EV_KEY,
+		.code		= BTN_2,
+		.debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
+		.gpio		= NBG6716_GPIO_BTN_USB2,
+		.active_low	= 1,
+	},
 	{
 		.desc		= "WPS button",
 		.type		= EV_KEY,