]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
usb: dwc3: core: initialize ULPI before trying to get the PHY
authorFelipe Balbi <felipe.balbi@linux.intel.com>
Mon, 5 Jun 2017 14:03:18 +0000 (17:03 +0300)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Tue, 13 Jun 2017 10:21:06 +0000 (13:21 +0300)
If don't reorder initialization like this, we will never be able to
get a reference to ULPI PHYs.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/dwc3/core.c

index 9d5a67cc2645a63965304ada92deb81c0ceed78e..25165a97db5e6c7141b9bfb42ea324e783aaa04a 100644 (file)
@@ -721,6 +721,8 @@ static void dwc3_core_setup_global_control(struct dwc3 *dwc)
        dwc3_writel(dwc->regs, DWC3_GCTL, reg);
 }
 
+static int dwc3_core_get_phy(struct dwc3 *dwc);
+
 /**
  * dwc3_core_init - Low-level initialization of DWC3 Core
  * @dwc: Pointer to our controller context structure
@@ -759,6 +761,10 @@ static int dwc3_core_init(struct dwc3 *dwc)
        if (ret)
                goto err0;
 
+       ret = dwc3_core_get_phy(dwc);
+       if (ret)
+               goto err0;
+
        dwc3_core_setup_global_control(dwc);
        dwc3_core_num_eps(dwc);
 
@@ -1156,10 +1162,6 @@ static int dwc3_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, dwc);
        dwc3_cache_hwparams(dwc);
 
-       ret = dwc3_core_get_phy(dwc);
-       if (ret)
-               goto err0;
-
        spin_lock_init(&dwc->lock);
 
        pm_runtime_set_active(dev);