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 <ha...@slashdirt.org>
---
target/linux/ar71xx/base-files/etc/diag.sh | 3 ++-
target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c | 17 +++++++----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index d3cdc81b39..280b83b413 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -384,7 +384,8 @@ get_status_led() {
rb-912uag-2hpnd|\
rb-912uag-5hpnd|\
rb-sxt2n|\
- rb-sxt5n)
+ rb-sxt5n|\
+ rb-wapg-5hact2hnd)
status_led="rb:green:power"
;;
re355|\
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,
},
};
--
2.13.6 (Apple Git-96)
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
