Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / drivers / usb / host / xhci-dwc3.c

diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index 374fe743fe3e34b67560041bb282fe8e9d349699..258d1cd00a085adaa9cf1c613947eaf43c3767aa 100644 (file)
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -111,6 +111,7 @@ void dwc3_set_fladj(struct dwc3 *dwc3_reg, u32 val)
                        GFLADJ_30MHZ(val));
 }
 
+#ifdef CONFIG_DM_USB
 static int xhci_dwc3_probe(struct udevice *dev)
 {
        struct xhci_dwc3_platdata *plat = dev_get_platdata(dev);
@@ -120,20 +121,20 @@ static int xhci_dwc3_probe(struct udevice *dev)
        enum usb_dr_mode dr_mode;
        int ret;
 
-       hccr = (struct xhci_hccr *)devfdt_get_addr(dev);
-       hcor = (struct xhci_hcor *)((phys_addr_t)hccr +
+       hccr = (struct xhci_hccr *)((uintptr_t)dev_read_addr(dev));
+       hcor = (struct xhci_hcor *)((uintptr_t)hccr +
                        HC_LENGTH(xhci_readl(&(hccr)->cr_capbase)));
 
        ret = generic_phy_get_by_index(dev, 0, &plat->usb_phy);
        if (ret) {
                if (ret != -ENOENT) {
-                       error("Failed to get USB PHY for %s\n", dev->name);
+                       pr_err("Failed to get USB PHY for %s\n", dev->name);
                        return ret;
                }
        } else {
                ret = generic_phy_init(&plat->usb_phy);
                if (ret) {
-                       error("Can't init USB PHY for %s\n", dev->name);
+                       pr_err("Can't init USB PHY for %s\n", dev->name);
                        return ret;
                }
        }
@@ -160,7 +161,7 @@ static int xhci_dwc3_remove(struct udevice *dev)
        if (generic_phy_valid(&plat->usb_phy)) {
                ret = generic_phy_exit(&plat->usb_phy);
                if (ret) {
-                       error("Can't deinit USB PHY for %s\n", dev->name);
+                       pr_err("Can't deinit USB PHY for %s\n", dev->name);
                        return ret;
                }
        }
@@ -184,3 +185,4 @@ U_BOOT_DRIVER(xhci_dwc3) = {
        .platdata_auto_alloc_size = sizeof(struct xhci_dwc3_platdata),
        .flags = DM_FLAG_ALLOC_PRIV_DMA,
 };
+#endif