From: Gabor Juhos Date: Tue, 31 Jan 2012 18:37:15 +0000 (+0000) Subject: ar71xx: unify LED names on D-Link boards X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=86ed7f89047718b573621c83be1b3122e5020347 ar71xx: unify LED names on D-Link boards SVN-Revision: 29974 --- diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index a3d5075a28..7759113015 100755 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -51,17 +51,15 @@ get_status_led() { db120) status_led="db120:green:status" ;; - dir-600-a1) - status_led="dir-600-a1:green:power" + dir-600-a1 |\ + dir-615-e4) + status_led="d-link:green:power" ;; dir-615-c1) - status_led="dir-615c1:green:status" - ;; - dir-615-e4) - status_led="dir-615-e4:green:power" + status_led="d-link:green:status" ;; dir-825-b1) - status_led="dir825b1:orange:power" + status_led="d-link:orange:power" ;; eap7660d) status_led="eap7660d:green:ds4" diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/leds b/target/linux/ar71xx/base-files/etc/uci-defaults/leds index c33510af46..5b5aea35a4 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/leds @@ -119,15 +119,15 @@ rb750) ;; dir-615-e4) - set_led_netdev "wan" "WAN" "dir-615-e4:green:wan" "eth1" - set_led_switch "lan1" "LAN1" "dir-615-e4:green:lan1" "switch0" "0x02" - set_led_switch "lan2" "LAN2" "dir-615-e4:green:lan2" "switch0" "0x04" - set_led_switch "lan3" "LAN3" "dir-615-e4:green:lan3" "switch0" "0x08" - set_led_switch "lan4" "LAN4" "dir-615-e4:green:lan4" "switch0" "0x10" + set_led_netdev "wan" "WAN" "d-link:green:wan" "eth1" + set_led_switch "lan1" "LAN1" "d-link:green:lan1" "switch0" "0x02" + set_led_switch "lan2" "LAN2" "d-link:green:lan2" "switch0" "0x04" + set_led_switch "lan3" "LAN3" "d-link:green:lan3" "switch0" "0x08" + set_led_switch "lan4" "LAN4" "d-link:green:lan4" "switch0" "0x10" ;; dir-825-b1) - set_led_usbdev "usb" "USB" "dir825b1:blue:usb" "1-1" + set_led_usbdev "usb" "USB" "d-link:blue:usb" "1-1" ;; hornet-ub) diff --git a/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-600-a1.c b/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-600-a1.c index ba833e8f70..e0da86752d 100644 --- a/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-600-a1.c +++ b/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-600-a1.c @@ -80,13 +80,13 @@ static struct flash_platform_data dir_600_a1_flash_data = { static struct gpio_led dir_600_a1_leds_gpio[] __initdata = { { - .name = "dir-600-a1:green:power", + .name = "d-link:green:power", .gpio = DIR_600_A1_GPIO_LED_POWER_GREEN, }, { - .name = "dir-600-a1:amber:power", + .name = "d-link:amber:power", .gpio = DIR_600_A1_GPIO_LED_POWER_AMBER, }, { - .name = "dir-600-a1:blue:wps", + .name = "d-link:blue:wps", .gpio = DIR_600_A1_GPIO_LED_WPS, .active_low = 1, } diff --git a/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-615-c1.c b/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-615-c1.c index fcadc6f067..c8ca49d85c 100644 --- a/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-615-c1.c +++ b/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-615-c1.c @@ -82,31 +82,31 @@ static struct flash_platform_data dir_615c1_flash_data = { static struct gpio_led dir_615c1_leds_gpio[] __initdata = { { - .name = "dir-615c1:orange:status", + .name = "d-link:orange:status", .gpio = DIR_615C1_GPIO_LED_ORANGE_STATUS, .active_low = 1, }, { - .name = "dir-615c1:blue:wps", + .name = "d-link:blue:wps", .gpio = DIR_615C1_GPIO_LED_BLUE_WPS, .active_low = 1, }, { - .name = "dir-615c1:green:wan", + .name = "d-link:green:wan", .gpio = DIR_615C1_GPIO_LED_GREEN_WAN, .active_low = 1, }, { - .name = "dir-615c1:green:wancpu", + .name = "d-link:green:wancpu", .gpio = DIR_615C1_GPIO_LED_GREEN_WANCPU, .active_low = 1, }, { - .name = "dir-615c1:green:wlan", + .name = "d-link:green:wlan", .gpio = DIR_615C1_GPIO_LED_GREEN_WLAN, .active_low = 1, }, { - .name = "dir-615c1:green:status", + .name = "d-link:green:status", .gpio = DIR_615C1_GPIO_LED_GREEN_STATUS, .active_low = 1, }, { - .name = "dir-615c1:orange:wan", + .name = "d-link:orange:wan", .gpio = DIR_615C1_GPIO_LED_ORANGE_WAN, .active_low = 1, } diff --git a/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-615-e4.c b/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-615-e4.c index 943929a59c..3f26b5ac3d 100644 --- a/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-615-e4.c +++ b/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-615-e4.c @@ -88,36 +88,36 @@ static struct flash_platform_data dir_615_e4_flash_data = { static struct gpio_led dir_615_e4_leds_gpio[] __initdata = { { - .name = "dir-615-e4:green:power", + .name = "d-link:green:power", .gpio = DIR_615_E4_GPIO_LED_POWER_GREEN, }, { - .name = "dir-615-e4:amber:power", + .name = "d-link:amber:power", .gpio = DIR_615_E4_GPIO_LED_POWER_AMBER, }, { - .name = "dir-615-e4:green:wan", + .name = "d-link:green:wan", .gpio = DIR_615_E4_GPIO_LED_WAN_GREEN, .active_low = 1, }, { - .name = "dir-615-e4:amber:wan", + .name = "d-link:amber:wan", .gpio = DIR_615_E4_GPIO_LED_WAN_AMBER, }, { - .name = "dir-615-e4:green:lan1", + .name = "d-link:green:lan1", .gpio = DIR_615_E4_GPIO_LED_LAN1_GREEN, .active_low = 1, }, { - .name = "dir-615-e4:green:lan2", + .name = "d-link:green:lan2", .gpio = DIR_615_E4_GPIO_LED_LAN2_GREEN, .active_low = 1, }, { - .name = "dir-615-e4:green:lan3", + .name = "d-link:green:lan3", .gpio = DIR_615_E4_GPIO_LED_LAN3_GREEN, .active_low = 1, }, { - .name = "dir-615-e4:green:lan4", + .name = "d-link:green:lan4", .gpio = DIR_615_E4_GPIO_LED_LAN4_GREEN, .active_low = 1, }, { - .name = "dir-615-e4:blue:wps", + .name = "d-link:blue:wps", .gpio = DIR_615_E4_GPIO_LED_WPS, .active_low = 1, } diff --git a/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-825-b1.c b/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-825-b1.c index fe672ff46b..a67676a651 100644 --- a/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-825-b1.c +++ b/target/linux/ar71xx/files-2.6.39/arch/mips/ar71xx/mach-dir-825-b1.c @@ -87,27 +87,27 @@ static struct flash_platform_data dir825b1_flash_data = { static struct gpio_led dir825b1_leds_gpio[] __initdata = { { - .name = "dir825b1:blue:usb", + .name = "d-link:blue:usb", .gpio = DIR825B1_GPIO_LED_BLUE_USB, .active_low = 1, }, { - .name = "dir825b1:orange:power", + .name = "d-link:orange:power", .gpio = DIR825B1_GPIO_LED_ORANGE_POWER, .active_low = 1, }, { - .name = "dir825b1:blue:power", + .name = "d-link:blue:power", .gpio = DIR825B1_GPIO_LED_BLUE_POWER, .active_low = 1, }, { - .name = "dir825b1:blue:wps", + .name = "d-link:blue:wps", .gpio = DIR825B1_GPIO_LED_BLUE_WPS, .active_low = 1, }, { - .name = "dir825b1:orange:planet", + .name = "d-link:orange:planet", .gpio = DIR825B1_GPIO_LED_ORANGE_PLANET, .active_low = 1, }, { - .name = "dir825b1:blue:planet", + .name = "d-link:blue:planet", .gpio = DIR825B1_GPIO_LED_BLUE_PLANET, .active_low = 1, } diff --git a/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-600-a1.c b/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-600-a1.c index 8b280caca1..9eca411a61 100644 --- a/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-600-a1.c +++ b/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-600-a1.c @@ -76,13 +76,13 @@ static struct flash_platform_data dir_600_a1_flash_data = { static struct gpio_led dir_600_a1_leds_gpio[] __initdata = { { - .name = "dir-600-a1:green:power", + .name = "d-link:green:power", .gpio = DIR_600_A1_GPIO_LED_POWER_GREEN, }, { - .name = "dir-600-a1:amber:power", + .name = "d-link:amber:power", .gpio = DIR_600_A1_GPIO_LED_POWER_AMBER, }, { - .name = "dir-600-a1:blue:wps", + .name = "d-link:blue:wps", .gpio = DIR_600_A1_GPIO_LED_WPS, .active_low = 1, } diff --git a/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-615-c1.c b/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-615-c1.c index 5e9550476c..b15fc6814c 100644 --- a/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-615-c1.c +++ b/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-615-c1.c @@ -78,31 +78,31 @@ static struct flash_platform_data dir_615c1_flash_data = { static struct gpio_led dir_615c1_leds_gpio[] __initdata = { { - .name = "dir-615c1:orange:status", + .name = "d-link:orange:status", .gpio = DIR_615C1_GPIO_LED_ORANGE_STATUS, .active_low = 1, }, { - .name = "dir-615c1:blue:wps", + .name = "d-link:blue:wps", .gpio = DIR_615C1_GPIO_LED_BLUE_WPS, .active_low = 1, }, { - .name = "dir-615c1:green:wan", + .name = "d-link:green:wan", .gpio = DIR_615C1_GPIO_LED_GREEN_WAN, .active_low = 1, }, { - .name = "dir-615c1:green:wancpu", + .name = "d-link:green:wancpu", .gpio = DIR_615C1_GPIO_LED_GREEN_WANCPU, .active_low = 1, }, { - .name = "dir-615c1:green:wlan", + .name = "d-link:green:wlan", .gpio = DIR_615C1_GPIO_LED_GREEN_WLAN, .active_low = 1, }, { - .name = "dir-615c1:green:status", + .name = "d-link:green:status", .gpio = DIR_615C1_GPIO_LED_GREEN_STATUS, .active_low = 1, }, { - .name = "dir-615c1:orange:wan", + .name = "d-link:orange:wan", .gpio = DIR_615C1_GPIO_LED_ORANGE_WAN, .active_low = 1, } diff --git a/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-615-e4.c b/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-615-e4.c index cce5dce795..b000a9cc2f 100644 --- a/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-615-e4.c +++ b/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-615-e4.c @@ -84,36 +84,36 @@ static struct flash_platform_data dir_615_e4_flash_data = { static struct gpio_led dir_615_e4_leds_gpio[] __initdata = { { - .name = "dir-615-e4:green:power", + .name = "d-link:green:power", .gpio = DIR_615_E4_GPIO_LED_POWER_GREEN, }, { - .name = "dir-615-e4:amber:power", + .name = "d-link:amber:power", .gpio = DIR_615_E4_GPIO_LED_POWER_AMBER, }, { - .name = "dir-615-e4:green:wan", + .name = "d-link:green:wan", .gpio = DIR_615_E4_GPIO_LED_WAN_GREEN, .active_low = 1, }, { - .name = "dir-615-e4:amber:wan", + .name = "d-link:amber:wan", .gpio = DIR_615_E4_GPIO_LED_WAN_AMBER, }, { - .name = "dir-615-e4:green:lan1", + .name = "d-link:green:lan1", .gpio = DIR_615_E4_GPIO_LED_LAN1_GREEN, .active_low = 1, }, { - .name = "dir-615-e4:green:lan2", + .name = "d-link:green:lan2", .gpio = DIR_615_E4_GPIO_LED_LAN2_GREEN, .active_low = 1, }, { - .name = "dir-615-e4:green:lan3", + .name = "d-link:green:lan3", .gpio = DIR_615_E4_GPIO_LED_LAN3_GREEN, .active_low = 1, }, { - .name = "dir-615-e4:green:lan4", + .name = "d-link:green:lan4", .gpio = DIR_615_E4_GPIO_LED_LAN4_GREEN, .active_low = 1, }, { - .name = "dir-615-e4:blue:wps", + .name = "d-link:blue:wps", .gpio = DIR_615_E4_GPIO_LED_WPS, .active_low = 1, } diff --git a/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-825-b1.c b/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-825-b1.c index 63cb8f48b9..ab973ebfb8 100644 --- a/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-825-b1.c +++ b/target/linux/ar71xx/files-3.2/arch/mips/ath79/mach-dir-825-b1.c @@ -83,27 +83,27 @@ static struct flash_platform_data dir825b1_flash_data = { static struct gpio_led dir825b1_leds_gpio[] __initdata = { { - .name = "dir825b1:blue:usb", + .name = "d-link:blue:usb", .gpio = DIR825B1_GPIO_LED_BLUE_USB, .active_low = 1, }, { - .name = "dir825b1:orange:power", + .name = "d-link:orange:power", .gpio = DIR825B1_GPIO_LED_ORANGE_POWER, .active_low = 1, }, { - .name = "dir825b1:blue:power", + .name = "d-link:blue:power", .gpio = DIR825B1_GPIO_LED_BLUE_POWER, .active_low = 1, }, { - .name = "dir825b1:blue:wps", + .name = "d-link:blue:wps", .gpio = DIR825B1_GPIO_LED_BLUE_WPS, .active_low = 1, }, { - .name = "dir825b1:orange:planet", + .name = "d-link:orange:planet", .gpio = DIR825B1_GPIO_LED_ORANGE_PLANET, .active_low = 1, }, { - .name = "dir825b1:blue:planet", + .name = "d-link:blue:planet", .gpio = DIR825B1_GPIO_LED_BLUE_PLANET, .active_low = 1, }