Message ID | 20160127014453.55bc5603@kosmio |
---|---|
State | Superseded |
Headers | show |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Michal schrieb am 27.01.2016 um 01:44: > From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> > > This patch provides full GPIO support for WNR2000v3 (LEDs and buttons). > It exposes all LEDs to operating system, including Ethernet ones. > > Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> Acked-by: Hartmut Knaack <knaack.h@gmx.de> > --- The patch subject should also be prefixed with ar71xx:WNR2000v3: ... I would recommend to additionally use the following parameters with git format-patch: --cover-letter -v4 > target/linux/ar71xx/base-files/etc/board.d/01_leds | 14 +++ > target/linux/ar71xx/base-files/etc/diag.sh | 1 + > .../ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c | 137 +++++++++++++++++++-- > 3 files changed, 142 insertions(+), 10 deletions(-) > > diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds > index 151eac2..7374422 100755 > --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds > +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds > @@ -676,6 +676,20 @@ wlae-ag300n) > ucidef_set_led_netdev "wireless" "WIRELESS" "buffalo:green:wireless" "wlan0" > ;; > > +wnr2000-v3) > + ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0" > + ucidef_set_led_default "wan-green" "WAN (green)" "netgear:green:wan" "0" > + ucidef_set_led_netdev "wlan" "WLAN" "netgear:blue:wlan" "wlan0" > + ucidef_set_led_switch "lan1green" "LAN1 (green)" "netgear:green:lan1" "switch0" "0x02" > + ucidef_set_led_switch "lan2green" "LAN2 (green)" "netgear:green:lan2" "switch0" "0x04" > + ucidef_set_led_switch "lan3green" "LAN3 (green)" "netgear:green:lan3" "switch0" "0x08" > + ucidef_set_led_switch "lan4green" "LAN4 (green)" "netgear:green:lan4" "switch0" "0x10" > + ucidef_set_led_default "lan1amber" "LAN1 (amber)" "netgear:amber:lan1" "0" > + ucidef_set_led_default "lan2amber" "LAN2 (amber)" "netgear:amber:lan2" "0" > + ucidef_set_led_default "lan3amber" "LAN3 (amber)" "netgear:amber:lan3" "0" > + ucidef_set_led_default "lan4amber" "LAN4 (amber)" "netgear:amber:lan4" "0" > + ;; > + > wnr2000-v4) > ucidef_set_led_netdev "wan" "WAN" "netgear:green:wan" "eth0" > ucidef_set_led_netdev "wlan" "WLAN" "netgear:blue:wlan" "wlan0" > diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh > index c0e73ad..4ee40f7 100644 > --- a/target/linux/ar71xx/base-files/etc/diag.sh > +++ b/target/linux/ar71xx/base-files/etc/diag.sh > @@ -368,6 +368,7 @@ get_status_led() { > wndr3700v4 | \ > wndr4300 | \ > wnr2000 | \ > + wnr2000-v3 |\ > wnr2200 |\ > wnr612-v2 |\ > wnr1000-v2 |\ > diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c > index ee6b449..b4ca9b1 100644 > --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c > +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c > @@ -14,6 +14,7 @@ > > #include <linux/mtd/mtd.h> > #include <linux/mtd/partitions.h> > +#include <linux/platform_device.h> /* PLATFORM_DEVID_AUTO is defined here */ > > #include <asm/mach-ath79/ath79.h> > #include <asm/mach-ath79/ar71xx_regs.h> /* needed to disable switch LEDs */ > @@ -26,11 +27,25 @@ > #include "dev-m25p80.h" > #include "machtypes.h" > > +/* ar7241 GPIOs */ > #define WNR2000V3_GPIO_LED_WAN_GREEN 0 > #define WNR2000V3_GPIO_LED_LAN1_AMBER 1 > -#define WNR2000V3_GPIO_LED_LAN4_AMBER 12 > -#define WNR2000V3_GPIO_LED_PWR_GREEN 14 > +#define WNR2000V3_GPIO_LED_LAN2_AMBER 6 > +#define WNR2000V3_GPIO_LED_WPS_GREEN 7 > +#define WNR2000V3_GPIO_LED_LAN3_AMBER 8 > #define WNR2000V3_GPIO_BTN_WPS 11 > +#define WNR2000V3_GPIO_LED_LAN4_AMBER 12 > +#define WNR2000V3_GPIO_LED_LAN1_GREEN 13 > +#define WNR2000V3_GPIO_LED_LAN2_GREEN 14 > +#define WNR2000V3_GPIO_LED_LAN3_GREEN 15 > +#define WNR2000V3_GPIO_LED_LAN4_GREEN 16 > +#define WNR2000V3_GPIO_LED_WAN_AMBER 17 > +/* ar9287 GPIOs */ > +#define WNR2000V3_GPIO_WMAC_LED_WLAN_BLUE 1 > +#define WNR2000V3_GPIO_WMAC_LED_TEST_AMBER 2 > +#define WNR2000V3_GPIO_WMAC_LED_POWER_GREEN 3 > +#define WNR2000V3_GPIO_WMAC_BTN_RESET 8 > +#define WNR2000V3_GPIO_WMAC_BTN_RFKILL 9 > > #define WNR612V2_GPIO_LED_PWR_GREEN 11 > > @@ -69,16 +84,67 @@ > > static struct gpio_led wnr2000v3_leds_gpio[] __initdata = { > { > - .name = "wnr2000v3:green:power", > - .gpio = WNR2000V3_GPIO_LED_PWR_GREEN, > + .name = "netgear:green:wan", > + .gpio = WNR2000V3_GPIO_LED_WAN_GREEN, > .active_low = 1, > }, { > - .name = "wnr2000v3:green:wan", > - .gpio = WNR2000V3_GPIO_LED_WAN_GREEN, > + .name = "netgear:amber:lan1", > + .gpio = WNR2000V3_GPIO_LED_LAN1_AMBER, > + .active_low = 1, > + }, { > + .name = "netgear:amber:lan2", > + .gpio = WNR2000V3_GPIO_LED_LAN2_AMBER, > + .active_low = 1, > + }, { > + .name = "netgear:amber:lan3", > + .gpio = WNR2000V3_GPIO_LED_LAN3_AMBER, > + .active_low = 1, > + }, { > + .name = "netgear:amber:lan4", > + .gpio = WNR2000V3_GPIO_LED_LAN4_AMBER, > + .active_low = 1, > + }, { > + .name = "netgear:green:wps", > + .gpio = WNR2000V3_GPIO_LED_WPS_GREEN, > + .active_low = 1, > + }, { > + .name = "netgear:green:lan1", > + .gpio = WNR2000V3_GPIO_LED_LAN1_GREEN, > + .active_low = 1, > + }, { > + .name = "netgear:green:lan2", > + .gpio = WNR2000V3_GPIO_LED_LAN2_GREEN, > + .active_low = 1, > + }, { > + .name = "netgear:green:lan3", > + .gpio = WNR2000V3_GPIO_LED_LAN3_GREEN, > + .active_low = 1, > + }, { > + .name = "netgear:green:lan4", > + .gpio = WNR2000V3_GPIO_LED_LAN4_GREEN, > + .active_low = 1, > + }, { > + .name = "netgear:amber:wan", > + .gpio = WNR2000V3_GPIO_LED_WAN_AMBER, > .active_low = 1, > } > }; > > +static struct gpio_led wnr2000v3_wmac_leds_gpio[] = { > + { > + .name = "netgear:green:power", > + .gpio = WNR2000V3_GPIO_WMAC_LED_POWER_GREEN, > + .active_low = 1, > + .default_state = LEDS_GPIO_DEFSTATE_ON, > + }, { > + .name = "netgear:amber:test", > + .gpio = WNR2000V3_GPIO_WMAC_LED_TEST_AMBER, > + .active_low = 1, > + } > +}; > + > +static const char *wnr2000v3_wmac_led_name = "netgear:blue:wlan"; > + > static struct gpio_led wnr612v2_leds_gpio[] __initdata = { > { > .name = "netgear:green:power", > @@ -171,13 +237,32 @@ static struct gpio_led wpn824n_wmac_leds_gpio[] = { > } > }; > > -static struct gpio_keys_button wnr2000v3_gpio_keys[] __initdata = { > +static struct gpio_keys_button wnr2000v3_keys_gpio[] __initdata = { > { > .desc = "wps", > .type = EV_KEY, > .code = KEY_WPS_BUTTON, > .debounce_interval = WNR2000V3_KEYS_DEBOUNCE_INTERVAL, > .gpio = WNR2000V3_GPIO_BTN_WPS, > + .active_low = 1, > + } > +}; > + > +static struct gpio_keys_button wnr2000v3_wmac_keys_gpio[] = { > + { > + .desc = "reset", > + .type = EV_KEY, > + .code = KEY_RESTART, > + .debounce_interval = WNR2000V3_KEYS_DEBOUNCE_INTERVAL, > + .gpio = WNR2000V3_GPIO_WMAC_BTN_RESET, > + .active_low = 1, > + }, { > + .desc = "rfkill", > + .type = EV_KEY, > + .code = KEY_RFKILL, > + .debounce_interval = WNR2000V3_KEYS_DEBOUNCE_INTERVAL, > + .gpio = WNR2000V3_GPIO_WMAC_BTN_RFKILL, > + .active_low = 1, > } > }; > > @@ -211,6 +296,26 @@ static void __init wnr2000v3_setup(void) > u8 *eth1_mac_addr = (u8 *) (art + WNR2000V3_MAC1_OFFSET); > > /* > + * Disable JTAG to use all AR724X GPIO LEDs. > + * Also disable CLKs and bit 20 as u-boot does. > + * Finally, allow OS to control all link LEDs. > + */ > + ath79_gpio_function_setup(AR724X_GPIO_FUNC_JTAG_DISABLE | > + AR724X_GPIO_FUNC_UART_EN, > + AR724X_GPIO_FUNC_CLK_OBS1_EN | > + AR724X_GPIO_FUNC_CLK_OBS2_EN | > + AR724X_GPIO_FUNC_CLK_OBS3_EN | > + AR724X_GPIO_FUNC_CLK_OBS4_EN | > + AR724X_GPIO_FUNC_CLK_OBS5_EN | > + AR724X_GPIO_FUNC_GE0_MII_CLK_EN | > + AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN | > + AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN | > + AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN | > + AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN | > + AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN | > + BIT(20)); > + > + /* > * For WNR2000v3 ART flash area used for wlan MAC is usually empty (0xff) > * so ath9k driver uses random MAC instead each time module is loaded. > * To fix that, assign permanent wlan MAC equal to ethN's MAC plus 1, > @@ -228,9 +333,21 @@ static void __init wnr2000v3_setup(void) > ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2000v3_leds_gpio), > wnr2000v3_leds_gpio); > > - ath79_register_gpio_keys_polled(-1, WNR2000V3_KEYS_POLL_INTERVAL, > - ARRAY_SIZE(wnr2000v3_gpio_keys), > - wnr2000v3_gpio_keys); > + /* Do not use id=-1, we can have more GPIO key-polled devices */ > + ath79_register_gpio_keys_polled(PLATFORM_DEVID_AUTO, > + WNR2000V3_KEYS_POLL_INTERVAL, > + ARRAY_SIZE(wnr2000v3_keys_gpio), > + wnr2000v3_keys_gpio); > + > + ap9x_pci_setup_wmac_led_pin(0, WNR2000V3_GPIO_WMAC_LED_WLAN_BLUE); > + ap9x_pci_setup_wmac_led_name(0, wnr2000v3_wmac_led_name); > + > + ap9x_pci_setup_wmac_leds(0, wnr2000v3_wmac_leds_gpio, > + ARRAY_SIZE(wnr2000v3_wmac_leds_gpio)); > + > + ap9x_pci_setup_wmac_btns(0, wnr2000v3_wmac_keys_gpio, > + ARRAY_SIZE(wnr2000v3_wmac_keys_gpio), > + WNR2000V3_KEYS_POLL_INTERVAL); > } > > MIPS_MACHINE(ATH79_MACH_WNR2000_V3, "WNR2000V3", "NETGEAR WNR2000 V3", wnr2000v3_setup); > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWrQbpAAoJEANoShj6yJFI7jQP/3wsHOria1FxYVxBmRt3ZBJu MPMy7PK4BgiZK/zanhTv5VIWKnNWO7k2l/Thn4PEC1nQG/S9ASztaSIuUDoH+yep WcghD9pCKN0u2hLKyeU4Fumn3rd77NYTKY6MfsZWk4DtbS/oQMYSDCyZiGpxWjgd RHGQwjCyYd1FaW8JuJBgJ9pvazCso/RCu3uadlGzTHsPI8TADq3lOz5j4kJwzuUm 4UCAWK3t0fWQ2K+6qPhdpk2camoRBKsDdOADJEXendZMQoM5J28PsuEvrQmyO4nJ 79eUAi5ev23/hcgcJ2xz2kRC18Yz155j+S1mZAPk5NlOaSoy1CKg7UcP2Dw1THQ4 Fiq2BIAzD6vYFLa0i279RSaJ8DiLGOUuDcAFZfIp8au65y7+D7RRrY5jH8BAWA43 RUBKfCu7rPY0PqJvzMC0JRHUUhATJ0MuZkrHW9Uom2OgYy3wbYM20Q6UTIKBNSUZ FOdpAUptYcaYfOmRUiEfVPfLJGsMPcuFzVLjWnP/dixL1Z7RcqVAsMHELm+1Or5u Il8wJbxPQt/e/aKYpXuY7IIl0KJoO0gwHTpsWFQa4yGuzJ78zFDw8YD6Mfcv6SL7 4xaNidgal7WklLvIJcxzpeDmojZrxiwjRqNhVi7zvbylXkuNmvWqYrUg77J9qsoc DLzEmNjs6YeoMAmB0ruM =UPAL -----END PGP SIGNATURE-----
diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds index 151eac2..7374422 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds @@ -676,6 +676,20 @@ wlae-ag300n) ucidef_set_led_netdev "wireless" "WIRELESS" "buffalo:green:wireless" "wlan0" ;; +wnr2000-v3) + ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0" + ucidef_set_led_default "wan-green" "WAN (green)" "netgear:green:wan" "0" + ucidef_set_led_netdev "wlan" "WLAN" "netgear:blue:wlan" "wlan0" + ucidef_set_led_switch "lan1green" "LAN1 (green)" "netgear:green:lan1" "switch0" "0x02" + ucidef_set_led_switch "lan2green" "LAN2 (green)" "netgear:green:lan2" "switch0" "0x04" + ucidef_set_led_switch "lan3green" "LAN3 (green)" "netgear:green:lan3" "switch0" "0x08" + ucidef_set_led_switch "lan4green" "LAN4 (green)" "netgear:green:lan4" "switch0" "0x10" + ucidef_set_led_default "lan1amber" "LAN1 (amber)" "netgear:amber:lan1" "0" + ucidef_set_led_default "lan2amber" "LAN2 (amber)" "netgear:amber:lan2" "0" + ucidef_set_led_default "lan3amber" "LAN3 (amber)" "netgear:amber:lan3" "0" + ucidef_set_led_default "lan4amber" "LAN4 (amber)" "netgear:amber:lan4" "0" + ;; + wnr2000-v4) ucidef_set_led_netdev "wan" "WAN" "netgear:green:wan" "eth0" ucidef_set_led_netdev "wlan" "WLAN" "netgear:blue:wlan" "wlan0" diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index c0e73ad..4ee40f7 100644 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -368,6 +368,7 @@ get_status_led() { wndr3700v4 | \ wndr4300 | \ wnr2000 | \ + wnr2000-v3 |\ wnr2200 |\ wnr612-v2 |\ wnr1000-v2 |\ diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c index ee6b449..b4ca9b1 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v3.c @@ -14,6 +14,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/platform_device.h> /* PLATFORM_DEVID_AUTO is defined here */ #include <asm/mach-ath79/ath79.h> #include <asm/mach-ath79/ar71xx_regs.h> /* needed to disable switch LEDs */ @@ -26,11 +27,25 @@ #include "dev-m25p80.h" #include "machtypes.h" +/* ar7241 GPIOs */ #define WNR2000V3_GPIO_LED_WAN_GREEN 0 #define WNR2000V3_GPIO_LED_LAN1_AMBER 1 -#define WNR2000V3_GPIO_LED_LAN4_AMBER 12 -#define WNR2000V3_GPIO_LED_PWR_GREEN 14 +#define WNR2000V3_GPIO_LED_LAN2_AMBER 6 +#define WNR2000V3_GPIO_LED_WPS_GREEN 7 +#define WNR2000V3_GPIO_LED_LAN3_AMBER 8 #define WNR2000V3_GPIO_BTN_WPS 11 +#define WNR2000V3_GPIO_LED_LAN4_AMBER 12 +#define WNR2000V3_GPIO_LED_LAN1_GREEN 13 +#define WNR2000V3_GPIO_LED_LAN2_GREEN 14 +#define WNR2000V3_GPIO_LED_LAN3_GREEN 15 +#define WNR2000V3_GPIO_LED_LAN4_GREEN 16 +#define WNR2000V3_GPIO_LED_WAN_AMBER 17 +/* ar9287 GPIOs */ +#define WNR2000V3_GPIO_WMAC_LED_WLAN_BLUE 1 +#define WNR2000V3_GPIO_WMAC_LED_TEST_AMBER 2 +#define WNR2000V3_GPIO_WMAC_LED_POWER_GREEN 3 +#define WNR2000V3_GPIO_WMAC_BTN_RESET 8 +#define WNR2000V3_GPIO_WMAC_BTN_RFKILL 9 #define WNR612V2_GPIO_LED_PWR_GREEN 11 @@ -69,16 +84,67 @@ static struct gpio_led wnr2000v3_leds_gpio[] __initdata = { { - .name = "wnr2000v3:green:power", - .gpio = WNR2000V3_GPIO_LED_PWR_GREEN, + .name = "netgear:green:wan", + .gpio = WNR2000V3_GPIO_LED_WAN_GREEN, .active_low = 1, }, { - .name = "wnr2000v3:green:wan", - .gpio = WNR2000V3_GPIO_LED_WAN_GREEN, + .name = "netgear:amber:lan1", + .gpio = WNR2000V3_GPIO_LED_LAN1_AMBER, + .active_low = 1, + }, { + .name = "netgear:amber:lan2", + .gpio = WNR2000V3_GPIO_LED_LAN2_AMBER, + .active_low = 1, + }, { + .name = "netgear:amber:lan3", + .gpio = WNR2000V3_GPIO_LED_LAN3_AMBER, + .active_low = 1, + }, { + .name = "netgear:amber:lan4", + .gpio = WNR2000V3_GPIO_LED_LAN4_AMBER, + .active_low = 1, + }, { + .name = "netgear:green:wps", + .gpio = WNR2000V3_GPIO_LED_WPS_GREEN, + .active_low = 1, + }, { + .name = "netgear:green:lan1", + .gpio = WNR2000V3_GPIO_LED_LAN1_GREEN, + .active_low = 1, + }, { + .name = "netgear:green:lan2", + .gpio = WNR2000V3_GPIO_LED_LAN2_GREEN, + .active_low = 1, + }, { + .name = "netgear:green:lan3", + .gpio = WNR2000V3_GPIO_LED_LAN3_GREEN, + .active_low = 1, + }, { + .name = "netgear:green:lan4", + .gpio = WNR2000V3_GPIO_LED_LAN4_GREEN, + .active_low = 1, + }, { + .name = "netgear:amber:wan", + .gpio = WNR2000V3_GPIO_LED_WAN_AMBER, .active_low = 1, } }; +static struct gpio_led wnr2000v3_wmac_leds_gpio[] = { + { + .name = "netgear:green:power", + .gpio = WNR2000V3_GPIO_WMAC_LED_POWER_GREEN, + .active_low = 1, + .default_state = LEDS_GPIO_DEFSTATE_ON, + }, { + .name = "netgear:amber:test", + .gpio = WNR2000V3_GPIO_WMAC_LED_TEST_AMBER, + .active_low = 1, + } +}; + +static const char *wnr2000v3_wmac_led_name = "netgear:blue:wlan"; + static struct gpio_led wnr612v2_leds_gpio[] __initdata = { { .name = "netgear:green:power", @@ -171,13 +237,32 @@ static struct gpio_led wpn824n_wmac_leds_gpio[] = { } }; -static struct gpio_keys_button wnr2000v3_gpio_keys[] __initdata = { +static struct gpio_keys_button wnr2000v3_keys_gpio[] __initdata = { { .desc = "wps", .type = EV_KEY, .code = KEY_WPS_BUTTON, .debounce_interval = WNR2000V3_KEYS_DEBOUNCE_INTERVAL, .gpio = WNR2000V3_GPIO_BTN_WPS, + .active_low = 1, + } +}; + +static struct gpio_keys_button wnr2000v3_wmac_keys_gpio[] = { + { + .desc = "reset", + .type = EV_KEY, + .code = KEY_RESTART, + .debounce_interval = WNR2000V3_KEYS_DEBOUNCE_INTERVAL, + .gpio = WNR2000V3_GPIO_WMAC_BTN_RESET, + .active_low = 1, + }, { + .desc = "rfkill", + .type = EV_KEY, + .code = KEY_RFKILL, + .debounce_interval = WNR2000V3_KEYS_DEBOUNCE_INTERVAL, + .gpio = WNR2000V3_GPIO_WMAC_BTN_RFKILL, + .active_low = 1, } }; @@ -211,6 +296,26 @@ static void __init wnr2000v3_setup(void) u8 *eth1_mac_addr = (u8 *) (art + WNR2000V3_MAC1_OFFSET); /* + * Disable JTAG to use all AR724X GPIO LEDs. + * Also disable CLKs and bit 20 as u-boot does. + * Finally, allow OS to control all link LEDs. + */ + ath79_gpio_function_setup(AR724X_GPIO_FUNC_JTAG_DISABLE | + AR724X_GPIO_FUNC_UART_EN, + AR724X_GPIO_FUNC_CLK_OBS1_EN | + AR724X_GPIO_FUNC_CLK_OBS2_EN | + AR724X_GPIO_FUNC_CLK_OBS3_EN | + AR724X_GPIO_FUNC_CLK_OBS4_EN | + AR724X_GPIO_FUNC_CLK_OBS5_EN | + AR724X_GPIO_FUNC_GE0_MII_CLK_EN | + AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN | + AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN | + AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN | + AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN | + AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN | + BIT(20)); + + /* * For WNR2000v3 ART flash area used for wlan MAC is usually empty (0xff) * so ath9k driver uses random MAC instead each time module is loaded. * To fix that, assign permanent wlan MAC equal to ethN's MAC plus 1, @@ -228,9 +333,21 @@ static void __init wnr2000v3_setup(void) ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2000v3_leds_gpio), wnr2000v3_leds_gpio); - ath79_register_gpio_keys_polled(-1, WNR2000V3_KEYS_POLL_INTERVAL, - ARRAY_SIZE(wnr2000v3_gpio_keys), - wnr2000v3_gpio_keys); + /* Do not use id=-1, we can have more GPIO key-polled devices */ + ath79_register_gpio_keys_polled(PLATFORM_DEVID_AUTO, + WNR2000V3_KEYS_POLL_INTERVAL, + ARRAY_SIZE(wnr2000v3_keys_gpio), + wnr2000v3_keys_gpio); + + ap9x_pci_setup_wmac_led_pin(0, WNR2000V3_GPIO_WMAC_LED_WLAN_BLUE); + ap9x_pci_setup_wmac_led_name(0, wnr2000v3_wmac_led_name); + + ap9x_pci_setup_wmac_leds(0, wnr2000v3_wmac_leds_gpio, + ARRAY_SIZE(wnr2000v3_wmac_leds_gpio)); + + ap9x_pci_setup_wmac_btns(0, wnr2000v3_wmac_keys_gpio, + ARRAY_SIZE(wnr2000v3_wmac_keys_gpio), + WNR2000V3_KEYS_POLL_INTERVAL); } MIPS_MACHINE(ATH79_MACH_WNR2000_V3, "WNR2000V3", "NETGEAR WNR2000 V3", wnr2000v3_setup);