shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

usb: host: xhci-plat: Bring USB phy up earlier to ensure

Browse Source 
streams supported
This commit is contained in:
DarkBahamut
2017-02-23 10:50:30 +09:00
committed by Mauro (mdrjr) Ribeiro
parent 821fe3147f
commit c20fbc62da
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/usb/host/xhci-plat.c
View File

@@ -209,6 +209,22 @@ static int xhci_plat_probe(struct platform_device *pdev)
if (priv_match)
*priv = *priv_match;
}
hcd->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0);
if (IS_ERR(hcd->usb_phy)) {
ret = PTR_ERR(hcd->usb_phy);
if (ret == -EPROBE_DEFER)
goto put_usb3_hcd;
hcd->usb_phy = NULL;
} else {
ret = usb_phy_init(hcd->usb_phy);
if (ret)
goto put_usb3_hcd;
}
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret)
goto disable_usb_phy;
device_wakeup_enable(hcd->self.controller);
@@ -227,22 +243,6 @@ static int xhci_plat_probe(struct platform_device *pdev)
if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
xhci->shared_hcd->can_do_streams = 1;
hcd->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0);
if (IS_ERR(hcd->usb_phy)) {
ret = PTR_ERR(hcd->usb_phy);
if (ret == -EPROBE_DEFER)
goto put_usb3_hcd;
hcd->usb_phy = NULL;
} else {
ret = usb_phy_init(hcd->usb_phy);
if (ret)
goto put_usb3_hcd;
}
ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (ret)
goto disable_usb_phy;
/* Get possile USB 3.0 type PHY (PIPE3) available with xhci */
xhci->shared_hcd->phy = devm_phy_get(pdev->dev.parent, "usb3-phy");
if (IS_ERR(xhci->shared_hcd->phy)) {