Revert "ar71xx: Allow to set the RXDV, RXD, TXD, TXE delays for QCA955x"

[openwrt.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-tl-wr1043nd-v2.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
index 4f873e2..abdbde0 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
@@ -43,7 +43,7 @@
 #define TL_WR1043_V2_GPIO_LED_SYSTEM   19
 
 #define TL_WR1043_V2_GPIO_BTN_RESET    16
-#define TL_WR1043_V2_GPIO_BTN_WLAN     17
+#define TL_WR1043_V2_GPIO_BTN_RFKILL   17
 
 #define TL_WR1043_V2_GPIO_USB_POWER    21
 
@@ -94,11 +94,11 @@ static struct gpio_keys_button tl_wr1043_v2_gpio_keys[] __initdata = {
                .active_low     = 1,
        },
        {
-               .desc           = "WLAN button",
+               .desc           = "RFKILL button",
                .type           = EV_KEY,
-               .code           = KEY_WLAN,
+               .code           = KEY_RFKILL,
                .debounce_interval = TL_WR1043_V2_KEYS_DEBOUNCE_INTERVAL,
-               .gpio           = TL_WR1043_V2_GPIO_BTN_WLAN,
+               .gpio           = TL_WR1043_V2_GPIO_BTN_RFKILL,
                .active_low     = 1,
        },
 };
@@ -168,7 +168,6 @@ static void __init tl_wr1043nd_v2_setup(void)
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
-       u8 tmpmac[ETH_ALEN];
 
        ath79_register_m25p80(&wr1043nd_v2_flash_data);
 
@@ -178,8 +177,7 @@ static void __init tl_wr1043nd_v2_setup(void)
                                        ARRAY_SIZE(tl_wr1043_v2_gpio_keys),
                                        tl_wr1043_v2_gpio_keys);
 
-       ath79_init_mac(tmpmac, mac, -1);
-       ath79_register_wmac(art + TL_WR1043_V2_WMAC_CALDATA_OFFSET, tmpmac);
+       ath79_register_wmac(art + TL_WR1043_V2_WMAC_CALDATA_OFFSET, mac);
 
        mdiobus_register_board_info(wr1043nd_v2_mdio0_info,
                                    ARRAY_SIZE(wr1043nd_v2_mdio0_info));