rpcd: iwinfo plugin fixes

[openwrt/svn-archive/archive.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 8f37d7a877cc3d1d3f2e3d4a2d9d72575e0a5564..0a9dfbc8a0f7374c1512b1a097236c84071d3258 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
@@ -100,7 +100,8 @@ static void __init tl_mr3020_setup(void)
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
        u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ath79_setup_ar933x_phy4_switch(false, true);
+       /* 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),
@@ -109,15 +110,15 @@ static void __init tl_mr3020_setup(void)
                                        ARRAY_SIZE(tl_mr3020_gpio_keys),
                                        tl_mr3020_gpio_keys);
 
-       ath79_set_usb_power_gpio(TL_MR3020_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
-                               "USB power");
+       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);
 
        ath79_register_mdio(0, 0x0);
        ath79_register_eth(0);
-       ath79_eth0_data.phy_mask = BIT(0);
        ath79_register_wmac(ee, mac);
 }