diff options
| author | Thibaut VARÈNE <hacks@slashdirt.org> | 2018-07-29 12:14:57 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-07-30 10:35:11 +0200 |
| commit | e99f760235bb45716018faab52d31ce8165f49a0 (patch) | |
| tree | 923a0177166cf07d31d5f8ed370891c79de4d355 /target/linux/ar71xx/files/arch | |
| parent | 03562bfcdb1acc4be33e72a7adf138c135720eab (diff) | |
| download | upstream-e99f760235bb45716018faab52d31ce8165f49a0.tar.gz upstream-e99f760235bb45716018faab52d31ce8165f49a0.tar.bz2 upstream-e99f760235bb45716018faab52d31ce8165f49a0.zip | |
ar71xx: rbspi: fix RB wAP AC gpio conflict and LED
e15c63a37574bd15ce3a6636c2f04741ab76f7b9 introduced code that was trying
to register GPIO 1 as both an LED and a button. The OEM source makes it
clear that LED1 is not wired to the SoC GPIOs. GPIO 1 is the reset button.
Furthermore the (green) power led default state should also be defined,
(matching OEM source), and it should be used by diag.sh since it's
currently the only software-controllable LED.
This patch fixes these issues and renames the corresponding #defines for
clarity
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
Diffstat (limited to 'target/linux/ar71xx/files/arch')
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c index f14b078b2c..ad67c6e869 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c @@ -478,10 +478,10 @@ static struct gpio_led rblhg_leds[] __initdata = { }; /* RB w APG-5HacT2HnD (wAP AC) gpios*/ -#define RBWAPGSC_LED1 1 -#define RBWAPGSC_LED2 8 -#define RBWAPGSC_LED3 9 -#define RBWAPGSC_POWERLED 16 +#define RBWAPGSC_WIFI_LED_1 1 +#define RBWAPGSC_WIFI_LED_2 8 +#define RBWAPGSC_WIFI_LED_3 9 +#define RBWAPGSC_GPIO_LED_POWER 16 #define RBWAPGSC_GPIO_BTN_RESET 1 #define RBWAPGSC_GPIO_MDIO_MDC 12 #define RBWAPGSC_GPIO_MDIO_DATA 11 @@ -489,13 +489,10 @@ static struct gpio_led rblhg_leds[] __initdata = { static struct gpio_led rbwapgsc_leds[] __initdata = { { - .name = "rb:green:led1", - .gpio = RBWAPGSC_LED1, - .active_low = 1, - },{ - .name = "rb:blue:power", - .gpio = RBWAPGSC_POWERLED, + .name = "rb:green:power", + .gpio = RBWAPGSC_GPIO_LED_POWER, .active_low = 1, + .default_state = LEDS_GPIO_DEFSTATE_ON, }, }; |