Merge branch 'master' of git://git.denx.de/u-boot

[u-boot] / drivers / usb / host / xhci-omap.c

diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c
index 7292ed817e2a2ce3eff045730d89a911ae9b54d6..912b2bd8d582258c1898e3272a98e3510dd7873c 100644 (file)
--- a/drivers/usb/host/xhci-omap.c
+++ b/drivers/usb/host/xhci-omap.c
@@ -27,11 +27,11 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static struct omap_xhci omap;
 
-inline int __board_usb_init(int index, enum board_usb_init_type init)
+inline int __board_usb_init(int index, enum usb_init_type init)
 {
        return 0;
 }
-int board_usb_init(int index, enum board_usb_init_type init) \
+int board_usb_init(int index, enum usb_init_type init)
        __attribute__((weak, alias("__board_usb_init")));
 
 static void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode)
@@ -98,9 +98,8 @@ static int omap_xhci_core_init(struct omap_xhci *omap)
 {
        int ret = 0;
 
-       omap_enable_phy_clocks(omap);
-
-       omap_usb3_phy_init(omap->usb3_phy);
+       usb_phy_power(1);
+       omap_enable_phy(omap);
 
        ret = dwc3_core_init(omap->dwc3_reg);
        if (ret) {
@@ -116,7 +115,7 @@ static int omap_xhci_core_init(struct omap_xhci *omap)
 
 static void omap_xhci_core_exit(struct omap_xhci *omap)
 {
-       usb3_phy_power(0);
+       usb_phy_power(0);
 }
 
 int xhci_hcd_init(int index, struct xhci_hccr **hccr, struct xhci_hcor **hcor)