aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-09-21 15:55:50 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-09-21 15:55:50 +0000
commite33ccdc2958f0929196e144543fd17d50a72728a (patch)
tree99f7f9bc68d2b4ec734bf80c97b5f281dc351434
parentd381cd170da1f5e5dc36cc6df6b93932f63de92e (diff)
downloadupstream-e33ccdc2958f0929196e144543fd17d50a72728a.tar.gz
upstream-e33ccdc2958f0929196e144543fd17d50a72728a.tar.bz2
upstream-e33ccdc2958f0929196e144543fd17d50a72728a.zip
ar71xx: use netgear prefix for WNDR3700 LED names
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 38098
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/diag.sh2
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/uci-defaults/01_leds4
-rwxr-xr-xtarget/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration4
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c10
-rw-r--r--target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c2
5 files changed, 13 insertions, 9 deletions
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 2719a1340a..c76084d1cd 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -171,7 +171,7 @@ get_status_led() {
status_led="wndap360:green:power"
;;
wndr3700)
- status_led="wndr3700:green:power"
+ status_led="netgear:green:power"
;;
wndr4300)
status_led="netgear:green:power"
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 845de4e788..691f6992ac 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -229,8 +229,8 @@ wndap360)
;;
wndr3700)
- ucidef_set_led_default "wan" "WAN LED (green)" "wndr3700:green:wan" "0"
- ucidef_set_led_usbdev "usb" "USB" "wndr3700:green:usb" "1-1"
+ ucidef_set_led_default "wan" "WAN LED (green)" "netgear:green:wan" "0"
+ ucidef_set_led_usbdev "usb" "USB" "netgear:green:usb" "1-1"
;;
wndr4300)
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration b/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
index 3687c2d5b4..b9d0d65b20 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration
@@ -46,6 +46,10 @@ migrate_leds()
board=$(ar71xx_board_name)
case "$board" in
+wndr3700)
+ migrate_leds "wndr3700:=netgear:"
+ ;;
+
*)
;;
esac
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c
index fccf1c6633..1315bab037 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c
@@ -51,23 +51,23 @@
static struct gpio_led wndr3700_leds_gpio[] __initdata = {
{
- .name = "wndr3700:green:power",
+ .name = "netgear:green:power",
.gpio = WNDR3700_GPIO_LED_POWER_GREEN,
.active_low = 1,
}, {
- .name = "wndr3700:orange:power",
+ .name = "netgear:orange:power",
.gpio = WNDR3700_GPIO_LED_POWER_ORANGE,
.active_low = 1,
}, {
- .name = "wndr3700:green:wps",
+ .name = "netgear:green:wps",
.gpio = WNDR3700_GPIO_LED_WPS_GREEN,
.active_low = 1,
}, {
- .name = "wndr3700:orange:wps",
+ .name = "netgear:orange:wps",
.gpio = WNDR3700_GPIO_LED_WPS_ORANGE,
.active_low = 1,
}, {
- .name = "wndr3700:green:wan",
+ .name = "netgear:green:wan",
.gpio = WNDR3700_GPIO_LED_WAN_GREEN,
.active_low = 1,
}
diff --git a/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c b/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c
index e6565dcdcd..6425b055da 100644
--- a/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c
+++ b/target/linux/ar71xx/files/drivers/leds/leds-wndr3700-usb.c
@@ -32,7 +32,7 @@ static enum led_brightness wndr3700_usb_led_get(struct led_classdev *cdev)
}
static struct led_classdev wndr3700_usb_led = {
- .name = "wndr3700:green:usb",
+ .name = "netgear:green:usb",
.brightness_set = wndr3700_usb_led_set,
.brightness_get = wndr3700_usb_led_get,
};