From e7586959df121c8371dd4501f85eb4c20d9f7f6e Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 1 Nov 2011 11:20:44 +0000
Subject: [PATCH] ar71xx: unify LED names on TP-Link boards

SVN-Revision: 28701
---
 target/linux/ar71xx/base-files/etc/diag.sh    | 31 ++++++-------------
 .../base-files/etc/uci-defaults/tl-mr3x20     |  2 +-
 .../base-files/etc/uci-defaults/tl-wr1043nd   |  4 +--
 .../base-files/etc/uci-defaults/tl-wr941nd    |  2 +-
 .../files/arch/mips/ar71xx/mach-tl-mr3x20.c   |  6 ++--
 .../arch/mips/ar71xx/mach-tl-wa901nd-v2.c     |  6 ++--
 .../files/arch/mips/ar71xx/mach-tl-wa901nd.c  |  4 +--
 .../files/arch/mips/ar71xx/mach-tl-wr1043nd.c |  8 ++---
 .../files/arch/mips/ar71xx/mach-tl-wr703n.c   |  2 +-
 .../files/arch/mips/ar71xx/mach-tl-wr741nd.c  |  4 +--
 .../files/arch/mips/ar71xx/mach-tl-wr841n.c   |  6 ++--
 .../files/arch/mips/ar71xx/mach-tl-wr941nd.c  |  8 ++---
 12 files changed, 36 insertions(+), 47 deletions(-)

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index ad4fc28b72..daa7407332 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -87,29 +87,18 @@ get_status_led() {
 	tew-632brp)
 		status_led="tew-632brp:green:status"
 		;;
-	tl-mr3220 | tl-mr3420)
-		status_led="tl-mr3x20:green:system"
-		;;
-	tl-wa901nd)
-		status_led="tl-wa901nd:green:system"
-		;;
-	tl-wa901nd-v2)
-		status_led="tl-wa901nd-v2:green:system"
-		;;
-	tl-wr1043nd)
-		status_led="tl-wr1043nd:green:system"
+	tl-mr3220 | \
+	tl-mr3420 | \
+	tl-wa901nd | \
+	tl-wa901nd-v2 | \
+	tl-wr1043nd | \
+	tl-wr741nd | \
+	tl-wr841n-v1 | \
+	tl-wr941nd)
+		status_led="tp-link:green:system"
 		;;
 	tl-wr703n)
-		status_led="tl-wr703n:blue:system"
-		;;
-	tl-wr741nd)
-		status_led="tl-wr741nd:green:system"
-		;;
-	tl-wr841n-v1)
-		status_led="tl-wr841n:green:system"
-		;;
-	tl-wr941nd)
-		status_led="tl-wr941nd:green:system"
+		status_led="tp-link:blue:system"
 		;;
 	unifi)
 		status_led="ubnt:green:dome"
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-mr3x20 b/target/linux/ar71xx/base-files/etc/uci-defaults/tl-mr3x20
index c9e5e38819..bdb7c3e785 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-mr3x20
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/tl-mr3x20
@@ -11,7 +11,7 @@ tlmr3x20_setup_leds() {
 	uci batch <<EOF
 set system.usb_led=led
 set system.usb_led.name='USB'
-set system.usb_led.sysfs='tl-mr3x20:green:3g'
+set system.usb_led.sysfs='tp-link:green:3g'
 set system.usb_led.trigger='usbdev'
 set system.usb_led.dev='1-1'
 set system.usb_led.interval='50'
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr1043nd b/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr1043nd
index 366276334c..e88cc54d69 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr1043nd
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr1043nd
@@ -11,11 +11,11 @@ tlwr1043nd_setup_leds() {
 	uci batch <<EOF
 set system.wlan_led=led
 set system.wlan_led.name='WLAN'
-set system.wlan_led.sysfs='tl-wr1043nd:green:wlan'
+set system.wlan_led.sysfs='tp-link:green:wlan'
 set system.wlan_led.trigger='phy0tpt'
 set system.usb_led=led
 set system.usb_led.name='USB'
-set system.usb_led.sysfs='tl-wr1043nd:green:usb'
+set system.usb_led.sysfs='tp-link:green:usb'
 set system.usb_led.trigger='usbdev'
 set system.usb_led.dev='1-1'
 set system.usb_led.interval='50'
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr941nd b/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr941nd
index 2033add37d..2b904734ce 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr941nd
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/tl-wr941nd
@@ -11,7 +11,7 @@ tl_wr941nd_set_wlan_led() {
 	uci batch <<EOF
 set system.wlan_led=led
 set system.wlan_led.name='WLAN'
-set system.wlan_led.sysfs='tl-wr941nd:green:wlan'
+set system.wlan_led.sysfs='tp-link:green:wlan'
 set system.wlan_led.trigger='phy0tpt'
 commit system
 EOF
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-mr3x20.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-mr3x20.c
index 341f22907e..e73fec9a02 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-mr3x20.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-mr3x20.c
@@ -73,15 +73,15 @@ static struct flash_platform_data tl_mr3x20_flash_data = {
 
 static struct gpio_led tl_mr3x20_leds_gpio[] __initdata = {
 	{
-		.name		= "tl-mr3x20:green:system",
+		.name		= "tp-link:green:system",
 		.gpio		= TL_MR3X20_GPIO_LED_SYSTEM,
 		.active_low	= 1,
 	}, {
-		.name		= "tl-mr3x20:green:qss",
+		.name		= "tp-link:green:qss",
 		.gpio		= TL_MR3X20_GPIO_LED_QSS,
 		.active_low	= 1,
 	}, {
-		.name		= "tl-mr3x20:green:3g",
+		.name		= "tp-link:green:3g",
 		.gpio		= TL_MR3X20_GPIO_LED_3G,
 		.active_low	= 1,
 	}
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
index 7fb4d80aef..198e0bfd12 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
@@ -70,14 +70,14 @@ static struct flash_platform_data tl_wa901nd_v2_flash_data = {
 
 static struct gpio_led tl_wa901nd_v2_leds_gpio[] __initdata = {
 	{
-		.name		= "tl-wa901nd-v2:green:system",
+		.name		= "tp-link:green:system",
 		.gpio		= TL_WA901ND_V2_GPIO_LED_SYSTEM,
 		.active_low	= 1,
 	}, {
-		.name		= "tl-wa901nd-v2:green:qss",
+		.name		= "tp-link:green:qss",
 		.gpio		= TL_WA901ND_V2_GPIO_LED_QSS,
 	}, {
-		.name		= "tl-wa901nd-v2:green:wlan",
+		.name		= "tp-link:green:wlan",
 		.gpio		= TL_WA901ND_V2_GPIO_LED_WLAN,
 		.active_low	= 1,
 	}
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
index 4a108feba1..ef30e64032 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
@@ -67,11 +67,11 @@ static struct flash_platform_data tl_wa901nd_flash_data = {
 
 static struct gpio_led tl_wa901nd_leds_gpio[] __initdata = {
 	{
-		.name		= "tl-wa901nd:green:system",
+		.name		= "tp-link:green:system",
 		.gpio		= TL_WA901ND_GPIO_LED_SYSTEM,
 		.active_low	= 1,
 	}, {
-		.name		= "tl-wa901nd:green:qss",
+		.name		= "tp-link:green:qss",
 		.gpio		= TL_WA901ND_GPIO_LED_QSS,
 		.active_low	= 1,
 	}
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
index 77262d7394..91aee70c3a 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr1043nd.c
@@ -73,19 +73,19 @@ static struct flash_platform_data tl_wr1043nd_flash_data = {
 
 static struct gpio_led tl_wr1043nd_leds_gpio[] __initdata = {
 	{
-		.name		= "tl-wr1043nd:green:usb",
+		.name		= "tp-link:green:usb",
 		.gpio		= TL_WR1043ND_GPIO_LED_USB,
 		.active_low	= 1,
 	}, {
-		.name		= "tl-wr1043nd:green:system",
+		.name		= "tp-link:green:system",
 		.gpio		= TL_WR1043ND_GPIO_LED_SYSTEM,
 		.active_low	= 1,
 	}, {
-		.name		= "tl-wr1043nd:green:qss",
+		.name		= "tp-link:green:qss",
 		.gpio		= TL_WR1043ND_GPIO_LED_QSS,
 		.active_low	= 0,
 	}, {
-		.name		= "tl-wr1043nd:green:wlan",
+		.name		= "tp-link:green:wlan",
 		.gpio		= TL_WR1043ND_GPIO_LED_WLAN,
 		.active_low	= 1,
 	}
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr703n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr703n.c
index 772af3dcc3..656e7493a3 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr703n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr703n.c
@@ -71,7 +71,7 @@ static struct flash_platform_data tl_wr703n_flash_data = {
 
 static struct gpio_led tl_wr703n_leds_gpio[] __initdata = {
 	{
-		.name		= "tl-wr703n:blue:system",
+		.name		= "tp-link:blue:system",
 		.gpio		= TL_WR703N_GPIO_LED_SYSTEM,
 		.active_low	= 1,
 	},
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
index 4732ab9cd8..76db88d644 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
@@ -66,11 +66,11 @@ static struct flash_platform_data tl_wr741nd_flash_data = {
 
 static struct gpio_led tl_wr741nd_leds_gpio[] __initdata = {
 	{
-		.name		= "tl-wr741nd:green:system",
+		.name		= "tp-link:green:system",
 		.gpio		= TL_WR741ND_GPIO_LED_SYSTEM,
 		.active_low	= 1,
 	}, {
-		.name		= "tl-wr741nd:green:qss",
+		.name		= "tp-link:green:qss",
 		.gpio		= TL_WR741ND_GPIO_LED_QSS,
 		.active_low	= 1,
 	}
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
index b523b274fd..e34a8fcc6c 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
@@ -69,14 +69,14 @@ static struct flash_platform_data tl_wr841n_v1_flash_data = {
 
 static struct gpio_led tl_wr841n_v1_leds_gpio[] __initdata = {
 	{
-		.name		= "tl-wr841n:green:system",
+		.name		= "tp-link:green:system",
 		.gpio		= TL_WR841ND_V1_GPIO_LED_SYSTEM,
 		.active_low	= 1,
 	}, {
-		.name		= "tl-wr841n:red:qss",
+		.name		= "tp-link:red:qss",
 		.gpio		= TL_WR841ND_V1_GPIO_LED_QSS_RED,
 	}, {
-		.name		= "tl-wr841n:green:qss",
+		.name		= "tp-link:green:qss",
 		.gpio		= TL_WR841ND_V1_GPIO_LED_QSS_GREEN,
 	}
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
index 04173ea269..8ca611de63 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
@@ -69,17 +69,17 @@ static struct flash_platform_data tl_wr941nd_flash_data = {
 
 static struct gpio_led tl_wr941nd_leds_gpio[] __initdata = {
 	{
-		.name		= "tl-wr941nd:green:system",
+		.name		= "tp-link:green:system",
 		.gpio		= TL_WR941ND_GPIO_LED_SYSTEM,
 		.active_low	= 1,
 	}, {
-		.name		= "tl-wr941nd:red:qss",
+		.name		= "tp-link:red:qss",
 		.gpio		= TL_WR941ND_GPIO_LED_QSS_RED,
 	}, {
-		.name		= "tl-wr941nd:green:qss",
+		.name		= "tp-link:green:qss",
 		.gpio		= TL_WR941ND_GPIO_LED_QSS_GREEN,
 	}, {
-		.name		= "tl-wr941nd:green:wlan",
+		.name		= "tp-link:green:wlan",
 		.gpio		= TL_WR941ND_GPIO_LED_WLAN,
 		.active_low	= 1,
 	}
-- 
2.30.2