aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-11-01 11:20:47 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-11-01 11:20:47 +0000
commitf372620ffae0edbcc501995fcedf34eba8607b5b (patch)
tree347392c78aadaae65ffb3ee126494c7f77e7e76e
parent66ab406d5ac58f21507a00451c5444fbbe9d8bb3 (diff)
downloadupstream-f372620ffae0edbcc501995fcedf34eba8607b5b.tar.gz
upstream-f372620ffae0edbcc501995fcedf34eba8607b5b.tar.bz2
upstream-f372620ffae0edbcc501995fcedf34eba8607b5b.zip
ar71xx: unify LED names on Planex boards
SVN-Revision: 28703
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/diag.sh6
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/uci-defaults/mzk-w04nu2
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c12
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c10
4 files changed, 14 insertions, 16 deletions
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index a608f4e063..d7673dedf1 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -63,11 +63,9 @@ get_status_led() {
ls-sr71)
status_led="ubnt:green:d22"
;;
- mzk-w04nu)
- status_led="mzk-w04nu:green:status"
- ;;
+ mzk-w04nu | \
mzk-w300nh)
- status_led="mzk-w300nh:green:status"
+ status_led="planex:green:status"
;;
nbg460n_550n_550nh)
status_led="nbg460n:green:power"
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/mzk-w04nu b/target/linux/ar71xx/base-files/etc/uci-defaults/mzk-w04nu
index 1be4149972..db3bcba552 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/mzk-w04nu
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/mzk-w04nu
@@ -11,7 +11,7 @@ mzk_w04nu_setup_leds() {
uci batch <<EOF
set system.usb_led=led
set system.usb_led.name='USB'
-set system.usb_led.sysfs='mzk-w04nu:green:usb'
+set system.usb_led.sysfs='planex: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/files/arch/mips/ar71xx/mach-mzk-w04nu.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
index 54dbe35fc8..4954d396ab 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
@@ -76,27 +76,27 @@ static struct flash_platform_data mzk_w04nu_flash_data = {
static struct gpio_led mzk_w04nu_leds_gpio[] __initdata = {
{
- .name = "mzk-w04nu:green:status",
+ .name = "planex:green:status",
.gpio = MZK_W04NU_GPIO_LED_STATUS,
.active_low = 1,
}, {
- .name = "mzk-w04nu:blue:wps",
+ .name = "planex:blue:wps",
.gpio = MZK_W04NU_GPIO_LED_WPS,
.active_low = 1,
}, {
- .name = "mzk-w04nu:green:wlan",
+ .name = "planex:green:wlan",
.gpio = MZK_W04NU_GPIO_LED_WLAN,
.active_low = 1,
}, {
- .name = "mzk-w04nu:green:usb",
+ .name = "planex:green:usb",
.gpio = MZK_W04NU_GPIO_LED_USB,
.active_low = 1,
}, {
- .name = "mzk-w04nu:green:ap",
+ .name = "planex:green:ap",
.gpio = MZK_W04NU_GPIO_LED_AP,
.active_low = 1,
}, {
- .name = "mzk-w04nu:green:router",
+ .name = "planex:green:router",
.gpio = MZK_W04NU_GPIO_LED_ROUTER,
.active_low = 1,
}
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
index 27f1738cf3..c3f2c5330c 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
@@ -75,23 +75,23 @@ static struct flash_platform_data mzk_w300nh_flash_data = {
static struct gpio_led mzk_w300nh_leds_gpio[] __initdata = {
{
- .name = "mzk-w300nh:green:status",
+ .name = "planex:green:status",
.gpio = MZK_W300NH_GPIO_LED_STATUS,
.active_low = 1,
}, {
- .name = "mzk-w300nh:blue:wps",
+ .name = "planex:blue:wps",
.gpio = MZK_W300NH_GPIO_LED_WPS,
.active_low = 1,
}, {
- .name = "mzk-w300nh:green:wlan",
+ .name = "planex:green:wlan",
.gpio = MZK_W300NH_GPIO_LED_WLAN,
.active_low = 1,
}, {
- .name = "mzk-w300nh:green:ap",
+ .name = "planex:green:ap",
.gpio = MZK_W300NH_GPIO_LED_AP,
.active_low = 1,
}, {
- .name = "mzk-w300nh:green:router",
+ .name = "planex:green:router",
.gpio = MZK_W300NH_GPIO_LED_ROUTER,
.active_low = 1,
}