ar71xx: make WLAN button RFKILL on wnr2000-v4

[openwrt/staging/lynxis/omap.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-wnr2000-v4.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v4.c
index 36896b727109714d6aebfacd3a1df40af1c9e8a3..9c10b9512833524d428814efa915af1736eb4c45 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v4.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2000-v4.c
@@ -102,6 +102,7 @@ static struct gpio_keys_button wnr2000v4_gpio_keys[] __initdata = {
                .code           = KEY_WPS_BUTTON,
                .debounce_interval = WNR2000V4_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WNR2000V4_GPIO_BTN_WPS,
+               .active_low     = 1,
        },
        {
                .desc           = "Reset button",
@@ -109,55 +110,47 @@ static struct gpio_keys_button wnr2000v4_gpio_keys[] __initdata = {
                .code           = KEY_RESTART,
                .debounce_interval = WNR2000V4_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WNR2000V4_GPIO_BTN_RESET,
+               .active_low     = 1,
        },
        {
                .desc           = "WLAN button",
                .type           = EV_KEY,
-               .code           = KEY_WLAN,
+               .code           = KEY_RFKILL,
                .debounce_interval = WNR2000V4_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = WNR2000V4_GPIO_BTN_WLAN,
+               .active_low     = 1,
        },
 };
 
 static void __init wnr_common_setup(void)
 {
        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
-       u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-
-       ath79_register_m25p80(NULL);
-
-       ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE |
-                                  AR934X_ETH_CFG_SW_PHY_SWAP);
+       u8 *ee  = (u8 *) KSEG1ADDR(0x1fff1000);
 
        ath79_register_mdio(1, 0x0);
 
-       /* LAN */
-       ath79_init_mac(ath79_eth1_data.mac_addr, art+WNR2000V4_MAC0_OFFSET, 0);
+       ath79_register_usb();
 
-       /* GMAC1 is connected to the internal switch */
-       ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
-       ath79_register_eth(1);
+       ath79_register_m25p80(NULL);
 
-       /* WAN */
-       ath79_init_mac(ath79_eth0_data.mac_addr, art+WNR2000V4_MAC1_OFFSET, 0);
+       ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_ONLY_MODE);
 
-       /* GMAC0 is connected to the PHY0 of the internal switch */
+       ath79_init_mac(ath79_eth0_data.mac_addr, art+WNR2000V4_MAC0_OFFSET, 0);
+       ath79_init_mac(ath79_eth1_data.mac_addr, art+WNR2000V4_MAC1_OFFSET, 0);
+
+       /* GMAC0 is connected to the PHY0 of the internal switch, GE0 */
        ath79_switch_data.phy4_mii_en = 1;
        ath79_switch_data.phy_poll_mask = BIT(4);
        ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
        ath79_eth0_data.phy_mask = BIT(4);
        ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
-
-       ath79_eth0_data.speed = SPEED_100;
-       ath79_eth0_data.duplex = DUPLEX_FULL;
-
        ath79_register_eth(0);
 
-       /* WLAN */
-       ath79_register_wmac(ee, art+WNR2000V4_MAC0_OFFSET);
+       /* GMAC1 is connected to the internal switch, GE1 */
+       ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
+       ath79_register_eth(1);
 
-       /* USB */
-       ath79_register_usb();
+       ath79_register_wmac(ee, art);
 }
 
 static void __init wnr2000v4_setup(void)