ar8216: Fix problem with AR8337 MAC swap handling

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

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
index acdfb0a..69a73cc 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
@@ -115,11 +115,11 @@ static struct gpio_keys_button nbg6716_gpio_keys[] __initdata = {
        },
        {
                .desc           = "RFKILL button",
-               .type           = EV_KEY,
+               .type           = EV_SW,
                .code           = KEY_RFKILL,
                .debounce_interval = NBG6716_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = NBG6716_GPIO_BTN_RFKILL,
-               .active_low     = 1,
+               .active_low     = 0,
        },
        {
                .desc           = "USB1 eject button",
@@ -251,6 +251,7 @@ static void __init nbg6716_010_setup(void)
        nbg6716_ar8327_pad0_cfg.rxclk_delay_en = true;
        nbg6716_ar8327_pad0_cfg.txclk_delay_sel = AR8327_CLK_DELAY_SEL1;
        nbg6716_ar8327_pad0_cfg.rxclk_delay_sel = AR8327_CLK_DELAY_SEL2;
+       nbg6716_ar8327_pad0_cfg.mac06_exchange_en = true;
 
        /* GMAC6 of the AR8337 switch is connected to GMAC1 via SGMII */
        nbg6716_ar8327_pad6_cfg.mode = AR8327_PAD_MAC_SGMII;