AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-19 11:48:43 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: host: ehci-msm: Remove dependency on OTG PHY

Browse Source 
Currently the EHCI MSM driver has a hard dependency to be created
by an OTG layer, namely the phy-msm-usb driver. In some cases or
board configurations we want to allow the EHCI host to be
instantiated without OTG capability. Instead, relax the dependency
on having an OTG PHY being present and call usb_add_hcd() directly.

Signed-off-by: Jack Pham <jackp@codeaurora.org>
Signed-off-by: Timur Tabi <timur@codeaurora.org>
Reviewed-by: Andy Gross <andy.gross@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jack Pham 2015-12-10 18:28:54 -06:00 committed by Greg Kroah-Hartman
parent 132f5005ab
commit c4398ef609
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/usb/host/ehci-msm.c
View File

@ -106,9 +106,9 @@ static int ehci_msm_probe(struct platform_device *pdev)
} }
/* /*
* OTG driver takes care of PHY initialization, clock management, * If there is an OTG driver, let it take care of PHY initialization,
* powering up VBUS, mapping of registers address space and power * clock management, powering up VBUS, mapping of registers address
* management. * space and power management.
*/ */
if (pdev->dev.of_node) if (pdev->dev.of_node)
phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0); phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0);
@ -116,27 +116,35 @@ static int ehci_msm_probe(struct platform_device *pdev)
phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2); phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
if (IS_ERR(phy)) { if (IS_ERR(phy)) {
dev_err(&pdev->dev, "unable to find transceiver\n"); if (PTR_ERR(phy) == -EPROBE_DEFER) {
ret = -EPROBE_DEFER; dev_err(&pdev->dev, "unable to find transceiver\n");
goto put_hcd; ret = -EPROBE_DEFER;
} goto put_hcd;
}
ret = otg_set_host(phy->otg, &hcd->self); phy = NULL;
if (ret < 0) {
dev_err(&pdev->dev, "unable to register with transceiver\n");
goto put_hcd;
} }
hcd->usb_phy = phy; hcd->usb_phy = phy;
device_init_wakeup(&pdev->dev, 1); device_init_wakeup(&pdev->dev, 1);
/*
* OTG device parent of HCD takes care of putting
* hardware into low power mode.
*/
pm_runtime_no_callbacks(&pdev->dev);
pm_runtime_enable(&pdev->dev);
/* FIXME: need to call usb_add_hcd() here? */ if (phy && phy->otg) {
/*
* MSM OTG driver takes care of adding the HCD and
* placing hardware into low power mode via runtime PM.
*/
ret = otg_set_host(phy->otg, &hcd->self);
if (ret < 0) {
dev_err(&pdev->dev, "unable to register with transceiver\n");
goto put_hcd;
}
pm_runtime_no_callbacks(&pdev->dev);
pm_runtime_enable(&pdev->dev);
} else {
ret = usb_add_hcd(hcd, hcd->irq, IRQF_SHARED);
if (ret)
goto put_hcd;
}
return 0; return 0;
@ -154,9 +162,10 @@ static int ehci_msm_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
pm_runtime_set_suspended(&pdev->dev); pm_runtime_set_suspended(&pdev->dev);
otg_set_host(hcd->usb_phy->otg, NULL); if (hcd->usb_phy && hcd->usb_phy->otg)
otg_set_host(hcd->usb_phy->otg, NULL);
/* FIXME: need to call usb_remove_hcd() here? */ else
usb_remove_hcd(hcd);
usb_put_hcd(hcd); usb_put_hcd(hcd);