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

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

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c
index 9732d5c..0a9dfbc 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c
@@ -12,6 +12,7 @@
 #include <linux/gpio.h>
 
 #include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
 
 #include "dev-eth.h"
 #include "dev-gpio-buttons.h"
@@ -99,6 +100,9 @@ static void __init tl_mr3020_setup(void)
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
        u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
 
+       /* disable PHY_SWAP and PHY_ADDR_SWAP bits */
+       ath79_setup_ar933x_phy4_switch(false, false);
+
        ath79_register_m25p80(&tl_mr3020_flash_data);
        ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_mr3020_leds_gpio),
                                 tl_mr3020_leds_gpio);
@@ -106,8 +110,9 @@ static void __init tl_mr3020_setup(void)
                                        ARRAY_SIZE(tl_mr3020_gpio_keys),
                                        tl_mr3020_gpio_keys);
 
-       gpio_request(TL_MR3020_GPIO_USB_POWER, "USB power");
-       gpio_direction_output(TL_MR3020_GPIO_USB_POWER, 1);
+       gpio_request_one(TL_MR3020_GPIO_USB_POWER,
+                        GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
        ath79_register_usb();
 
        ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);