ar71xx: fix wlan LED on the TL-WR741 board

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-tl-wr941nd.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
index 0f4277ea0dacc8eaa5ea62811e590e2b852707f3..4f71df66e9aceddea657a49795781ddf15272402 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
@@ -24,6 +24,7 @@
 #define TL_WR941ND_GPIO_LED_SYSTEM     2
 #define TL_WR941ND_GPIO_LED_QSS_RED    4
 #define TL_WR941ND_GPIO_LED_QSS_GREEN  5
+#define TL_WR941ND_GPIO_LED_WLAN       9
 
 #define TL_WR941ND_GPIO_BTN_RESET      3
 #define TL_WR941ND_GPIO_BTN_QSS                7
@@ -37,20 +38,20 @@ static struct mtd_partition tl_wr941nd_partitions[] = {
                .offset         = 0,
                .size           = 0x020000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "kernel",
                .offset         = 0x020000,
                .size           = 0x140000,
-       } , {
+       }, {
                .name           = "rootfs",
                .offset         = 0x160000,
                .size           = 0x290000,
-       } , {
+       }, {
                .name           = "art",
                .offset         = 0x3f0000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "firmware",
                .offset         = 0x020000,
                .size           = 0x3d0000,
@@ -60,8 +61,8 @@ static struct mtd_partition tl_wr941nd_partitions[] = {
 
 static struct flash_platform_data tl_wr941nd_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = tl_wr941nd_partitions,
-        .nr_parts       = ARRAY_SIZE(tl_wr941nd_partitions),
+       .parts          = tl_wr941nd_partitions,
+       .nr_parts       = ARRAY_SIZE(tl_wr941nd_partitions),
 #endif
 };
 
@@ -76,6 +77,10 @@ static struct gpio_led tl_wr941nd_leds_gpio[] __initdata = {
        }, {
                .name           = "tl-wr941nd:green:qss",
                .gpio           = TL_WR941ND_GPIO_LED_QSS_GREEN,
+       }, {
+               .name           = "tl-wr941nd:green:wlan",
+               .gpio           = TL_WR941ND_GPIO_LED_WLAN,
+               .active_low     = 1,
        }
 };
 
@@ -83,15 +88,15 @@ static struct gpio_button tl_wr941nd_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
-               .threshold      = 5,
+               .code           = KEY_RESTART,
+               .threshold      = 3,
                .gpio           = TL_WR941ND_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "qss",
                .type           = EV_KEY,
-               .code           = BTN_1,
-               .threshold      = 5,
+               .code           = KEY_WPS_BUTTON,
+               .threshold      = 3,
                .gpio           = TL_WR941ND_GPIO_BTN_QSS,
                .active_low     = 1,
        }
@@ -116,12 +121,10 @@ static void __init tl_wr941nd_setup(void)
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_set_mac_base(mac);
-
        ar71xx_add_device_mdio(0x0);
 
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth0_data.phy_mask = 0x0;
        ar71xx_eth0_data.speed = SPEED_100;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;