ar71xx: vanity changes for dir-825-c1

This patch

- changes the color names from orange to amber
- changes the name of GPIO 13 from WIFI_BGN (wifi_bgn) to WLAN_2G
  (wlan2g) to be more consistent with the other routers' files
- changes the descriptions of the hardware keys to be a tad more
  explicit

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Patchwork: http://patchwork.openwrt.org/patch/4081/
[juhosg: update the LED migration script as well]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38105

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index d6811c55c47d660c5e5c7ab16e6bc21eff17202d..6ee49d1803e3eb6176baafcc3d4ce931281a1613 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -51,12 +51,12 @@ get_status_led() {
        dir-615-c1)
                status_led="d-link:green:status"
                ;;
-       dir-825-b1 |\
-       dir-835-a1)
+       dir-825-b1)
                status_led="d-link:orange:power"
                ;;
-       dir-825-c1)
-               status_led="d-link:orange:power"
+       dir-825-c1 |\
+       dir-835-a1)
+               status_led="d-link:amber:power"
                ;;
        eap7660d)
                status_led="eap7660d:green:ds4"

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 0ecf4be1318adfea49a5ed4095c51f7fafcb89c3..f3f1adfaa1a5269b2a9b2626dbae4cf9c3e813f4 100755 (executable)
--- 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,11 @@ migrate_leds()
 board=$(ar71xx_board_name)
 
 case "$board" in
+dir-825-c1|\
+dir-835-a1)
+       migrate_leds ":orange:=:amber:" ":wifi_bgn=:wlan2g"
+       ;;
+
 wndap360)
        migrate_leds "wndap360:=netgear:"
        ;;

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
index 980c6db1053aab219d8d96bf1f64c84d27d381d5..af9805a574bd617d9b1830697fc60700932e702e 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
@@ -29,12 +29,12 @@
 #include "machtypes.h"
 
 #define DIR825C1_GPIO_LED_BLUE_USB             11
-#define DIR825C1_GPIO_LED_ORANGE_POWER         14
+#define DIR825C1_GPIO_LED_AMBER_POWER          14
 #define DIR825C1_GPIO_LED_BLUE_POWER           22
 #define DIR825C1_GPIO_LED_BLUE_WPS             15
-#define DIR825C1_GPIO_LED_ORANGE_PLANET                19
+#define DIR825C1_GPIO_LED_AMBER_PLANET         19
 #define DIR825C1_GPIO_LED_BLUE_PLANET          18
-#define DIR825C1_GPIO_LED_WIFI_BGN             13
+#define DIR825C1_GPIO_LED_WLAN_2G              13
 
 #define DIR825C1_GPIO_WAN_LED_ENABLE           20
 
@@ -56,8 +56,8 @@ static struct gpio_led dir825c1_leds_gpio[] __initdata = {
                .active_low     = 1,
        },
        {
-               .name           = "d-link:orange:power",
-               .gpio           = DIR825C1_GPIO_LED_ORANGE_POWER,
+               .name           = "d-link:amber:power",
+               .gpio           = DIR825C1_GPIO_LED_AMBER_POWER,
                .active_low     = 1,
        },
        {
@@ -71,21 +71,21 @@ static struct gpio_led dir825c1_leds_gpio[] __initdata = {
                .active_low     = 1,
        },
        {
-               .name           = "d-link:orange:planet",
-               .gpio           = DIR825C1_GPIO_LED_ORANGE_PLANET,
+               .name           = "d-link:amber:planet",
+               .gpio           = DIR825C1_GPIO_LED_AMBER_PLANET,
                .active_low     = 1,
        },
        {
-               .name           = "d-link:blue:wifi_bgn",
-               .gpio           = DIR825C1_GPIO_LED_WIFI_BGN,
+               .name           = "d-link:blue:wlan2g",
+               .gpio           = DIR825C1_GPIO_LED_WLAN_2G,
                .active_low     = 1,
        },
 };
 
 static struct gpio_led dir835a1_leds_gpio[] __initdata = {
        {
-               .name           = "d-link:orange:power",
-               .gpio           = DIR825C1_GPIO_LED_ORANGE_POWER,
+               .name           = "d-link:amber:power",
+               .gpio           = DIR825C1_GPIO_LED_AMBER_POWER,
                .active_low     = 1,
        },
        {
@@ -99,8 +99,8 @@ static struct gpio_led dir835a1_leds_gpio[] __initdata = {
                .active_low     = 1,
        },
        {
-               .name           = "d-link:orange:planet",
-               .gpio           = DIR825C1_GPIO_LED_ORANGE_PLANET,
+               .name           = "d-link:amber:planet",
+               .gpio           = DIR825C1_GPIO_LED_AMBER_PLANET,
                .active_low     = 1,
        },
        {
@@ -112,7 +112,7 @@ static struct gpio_led dir835a1_leds_gpio[] __initdata = {
 
 static struct gpio_keys_button dir825c1_gpio_keys[] __initdata = {
        {
-               .desc           = "reset",
+               .desc           = "Soft reset",
                .type           = EV_KEY,
                .code           = KEY_RESTART,
                .debounce_interval = DIR825C1_KEYS_DEBOUNCE_INTERVAL,
@@ -120,7 +120,7 @@ static struct gpio_keys_button dir825c1_gpio_keys[] __initdata = {
                .active_low     = 1,
        },
        {
-               .desc           = "wps",
+               .desc           = "WPS button",
                .type           = EV_KEY,
                .code           = KEY_WPS_BUTTON,
                .debounce_interval = DIR825C1_KEYS_DEBOUNCE_INTERVAL,