armv8/ls2085qds: Update SFP TX bit as "0" to enable XFI

[karo-tx-uboot.git] / board / sunxi / board.c

diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 4c51468cf2b12db3e8a92c1966b9590567cfac6e..ed60e74808ffd4c8b6187d5cb5f1c0d231a40e8c 100644 (file)
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -476,7 +476,7 @@ static struct musb_hdrc_platform_data musb_plat = {
 #ifdef CONFIG_USB_GADGET
 int g_dnl_board_usb_cable_connected(void)
 {
-       return sunxi_usbc_vbus_detect(0);
+       return sunxi_usb_phy_vbus_detect(0);
 }
 #endif
 
@@ -530,10 +530,11 @@ int misc_init_r(void)
                }
        }
 
+#ifndef CONFIG_MACH_SUN9I
        ret = sunxi_usb_phy_probe();
        if (ret)
                return ret;
-
+#endif
 #if defined(CONFIG_MUSB_HOST) || defined(CONFIG_MUSB_GADGET)
        musb_register(&musb_plat, NULL, (void *)SUNXI_USB0_BASE);
 #endif