From 66ab406d5ac58f21507a00451c5444fbbe9d8bb3 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 1 Nov 2011 11:20:46 +0000 Subject: [PATCH] ar71xx: unify LED names on Buffalo boards SVN-Revision: 28702 --- target/linux/ar71xx/base-files/etc/diag.sh | 8 +++----- .../ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh | 6 +++--- .../ar71xx/files/arch/mips/ar71xx/mach-whr-hp-g300n.c | 6 +++--- .../ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c | 2 +- .../ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c | 10 +++++----- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index daa7407332..a608f4e063 100755 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -103,8 +103,9 @@ get_status_led() { unifi) status_led="ubnt:green:dome" ;; - whr-hp-g300n) - status_led="whr-hp-g300n:green:router" + whr-hp-g300n | \ + wzr-hp-g300nh) + status_led="buffalo:green:router" ;; wndr3700 | wndr3700v2) status_led="wndr3700:green:power" @@ -121,9 +122,6 @@ get_status_led() { wrt160nl) status_led="wrt160nl:blue:wps" ;; - wzr-hp-g300nh) - status_led="wzr-hp-g300nh:green:router" - ;; zcn-1523h-2 | zcn-1523h-5) status_led="zcn-1523h:amber:init" ;; diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh b/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh index 1308a7bb04..989435c1db 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh @@ -12,19 +12,19 @@ wzrhpg300nh_set_leds() { add system led set system.@led[-1]='led' set system.@led[-1].name='Wireless' -set system.@led[-1].sysfs='wzr-hp-g300nh:green:wireless' +set system.@led[-1].sysfs='buffalo:green:wireless' set system.@led[-1].trigger='phy0tpt' add system led set system.@led[-1]='led' set system.@led[-1].name='Router' -set system.@led[-1].sysfs='wzr-hp-g300nh:green:router' +set system.@led[-1].sysfs='buffalo:green:router' set system.@led[-1].trigger='netdev' set system.@led[-1].dev='eth1' set system.@led[-1].mode='link tx rx' add system led set system.@led[-1]='led' set system.@led[-1].name='USB' -set system.@led[-1].sysfs='wzr-hp-g300nh:blue:usb' +set system.@led[-1].sysfs='buffalo:blue:usb' set system.@led[-1].trigger='usbdev' set system.@led[-1].dev='1-1' set system.@led[-1].interval='50' diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-whr-hp-g300n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-whr-hp-g300n.c index a88a481890..b29bf71bb7 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-whr-hp-g300n.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-whr-hp-g300n.c @@ -83,15 +83,15 @@ static struct flash_platform_data whrhpg300n_flash_data = { static struct gpio_led whrhpg300n_leds_gpio[] __initdata = { { - .name = "whr-hp-g300n:orange:security", + .name = "buffalo:orange:security", .gpio = WHRHPG300N_GPIO_LED_SECURITY, .active_low = 1, }, { - .name = "whr-hp-g300n:red:diag", + .name = "buffalo:red:diag", .gpio = WHRHPG300N_GPIO_LED_DIAG, .active_low = 1, }, { - .name = "whr-hp-g300n:green:router", + .name = "buffalo:green:router", .gpio = WHRHPG300N_GPIO_LED_ROUTER, .active_low = 1, } diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c index 768c02d1ac..ac0b9bfc0a 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c @@ -123,7 +123,7 @@ static void add_mtd_concat_notifier(void) static struct gpio_led wzrhpag300h_leds_gpio[] __initdata = { { - .name = "wzr-hp-ag300h:red:diag", + .name = "buffalo:red:diag", .gpio = 1, .active_low = 1, }, diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c index 9a1fbea391..2eb742e4a9 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c @@ -122,23 +122,23 @@ static struct platform_device wzrhpg300nh_flash_device = { static struct gpio_led wzrhpg300nh_leds_gpio[] __initdata = { { - .name = "wzr-hp-g300nh:orange:security", + .name = "buffalo:orange:security", .gpio = WZRHPG300NH_GPIO_LED_SECURITY, .active_low = 1, }, { - .name = "wzr-hp-g300nh:green:wireless", + .name = "buffalo:green:wireless", .gpio = WZRHPG300NH_GPIO_LED_WIRELESS, .active_low = 1, }, { - .name = "wzr-hp-g300nh:green:router", + .name = "buffalo:green:router", .gpio = WZRHPG300NH_GPIO_LED_ROUTER, .active_low = 1, }, { - .name = "wzr-hp-g300nh:red:diag", + .name = "buffalo:red:diag", .gpio = WZRHPG300NH_GPIO_LED_DIAG, .active_low = 1, }, { - .name = "wzr-hp-g300nh:blue:usb", + .name = "buffalo:blue:usb", .gpio = WZRHPG300NH_GPIO_LED_USB, .active_low = 1, } -- 2.30.2