summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-01 11:20:47 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-11-01 11:20:47 +0000
commit0fe49305dea4165c62583f3bce346aedfd686a99 (patch)
treefb090f9584a14402afc8a4a0a5cf0bc0b0aaf81f
parent54e69d54d624cf3a2df41bcb363f83e4add6cbaf (diff)
ar71xx: unify LED names on Planex boards
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28703 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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 a608f4e06..d7673dedf 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 1be414997..db3bcba55 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 54dbe35fc..4954d396a 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 27f1738cf..c3f2c5330 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,
}