From 9b7b57aeb4f2d46ec01ebb15ceca5acbef9ce720 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 12 Apr 2014 17:42:33 +0000 Subject: [PATCH] ar71xx: wndr4300: change 'orange' to 'amber' in LED color names The hardware manual says amber so change the color part of the LED names to reflect that. Also update the constant names. Based on the the WNDR3700v4 support patch from Ralph Perlich: http://patchwork.openwrt.org/patch/4763/ Signed-off-by: Gabor Juhos SVN-Revision: 40473 --- .../etc/uci-defaults/04_led_migration | 4 ++++ .../files/arch/mips/ath79/mach-wndr4300.c | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) 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 f3f1adfaa1..5387b22b38 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 @@ -59,6 +59,10 @@ wndr3700) migrate_leds "wndr3700:=netgear:" ;; +wndr4300) + migrate_leds ":orange:=:amber:" + ;; + wnr2000) migrate_leds "wnr2000:=netgear:" ;; diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c index 0ecedff115..d67b8f85e1 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c @@ -2,6 +2,7 @@ * NETGEAR WNDR4300 board support * * Copyright (C) 2012 Gabor Juhos + * Copyright (C) 2014 Ralph Perlich * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published @@ -31,13 +32,13 @@ #include "machtypes.h" #define WNDR4300_GPIO_LED_POWER_GREEN 0 -#define WNDR4300_GPIO_LED_POWER_ORANGE 2 +#define WNDR4300_GPIO_LED_POWER_AMBER 2 #define WNDR4300_GPIO_LED_USB 13 #define WNDR4300_GPIO_LED_WAN_GREEN 1 -#define WNDR4300_GPIO_LED_WAN_ORANGE 3 +#define WNDR4300_GPIO_LED_WAN_AMBER 3 #define WNDR4300_GPIO_LED_WLAN5G 14 #define WNDR4300_GPIO_LED_WPS_GREEN 16 -#define WNDR4300_GPIO_LED_WPS_ORANGE 17 +#define WNDR4300_GPIO_LED_WPS_AMBER 17 #define WNDR4300_GPIO_BTN_RESET 21 #define WNDR4300_GPIO_BTN_WIRELESS 15 @@ -53,8 +54,8 @@ static struct gpio_led wndr4300_leds_gpio[] __initdata = { .active_low = 1, }, { - .name = "netgear:orange:power", - .gpio = WNDR4300_GPIO_LED_POWER_ORANGE, + .name = "netgear:amber:power", + .gpio = WNDR4300_GPIO_LED_POWER_AMBER, .active_low = 1, }, { @@ -63,8 +64,8 @@ static struct gpio_led wndr4300_leds_gpio[] __initdata = { .active_low = 1, }, { - .name = "netgear:orange:wan", - .gpio = WNDR4300_GPIO_LED_WAN_ORANGE, + .name = "netgear:amber:wan", + .gpio = WNDR4300_GPIO_LED_WAN_AMBER, .active_low = 1, }, { @@ -78,8 +79,8 @@ static struct gpio_led wndr4300_leds_gpio[] __initdata = { .active_low = 1, }, { - .name = "netgear:orange:wps", - .gpio = WNDR4300_GPIO_LED_WPS_ORANGE, + .name = "netgear:amber:wps", + .gpio = WNDR4300_GPIO_LED_WPS_AMBER, .active_low = 1, }, { -- 2.30.2