From 0dbe07edab1081a299c7ca6475896e91c03958fe Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 21 Sep 2013 15:55:50 +0000 Subject: [PATCH] ar71xx: use netgear prefix for WNDR3700 LED names Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38098 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/base-files/etc/diag.sh | 2 +- .../linux/ar71xx/base-files/etc/uci-defaults/01_leds | 4 ++-- .../base-files/etc/uci-defaults/04_led_migration | 4 ++++ .../linux/ar71xx/files/arch/mips/ath79/mach-wndr3700.c | 10 +++++----- .../ar71xx/files/drivers/leds/leds-wndr3700-usb.c | 2 +- 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, };