|
|
@@ -0,0 +1,47 @@
|
|
|
+--- a/drivers/usb/host/xhci-plat.c
|
|
|
++++ b/drivers/usb/host/xhci-plat.c
|
|
|
+@@ -16,6 +16,7 @@
|
|
|
+ #include <linux/module.h>
|
|
|
+ #include <linux/of.h>
|
|
|
+ #include <linux/platform_device.h>
|
|
|
++#include <linux/usb/phy.h>
|
|
|
+ #include <linux/slab.h>
|
|
|
+ #include <linux/usb/xhci_pdriver.h>
|
|
|
+
|
|
|
+@@ -158,12 +159,27 @@ static int xhci_plat_probe(struct platfo
|
|
|
+ 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(xhci->shared_hcd, irq, IRQF_SHARED);
|
|
|
+ if (ret)
|
|
|
+- goto put_usb3_hcd;
|
|
|
++ goto disable_usb_phy;
|
|
|
+
|
|
|
+ return 0;
|
|
|
+
|
|
|
++disable_usb_phy:
|
|
|
++ usb_phy_shutdown(hcd->usb_phy);
|
|
|
++
|
|
|
+ put_usb3_hcd:
|
|
|
+ usb_put_hcd(xhci->shared_hcd);
|
|
|
+
|
|
|
+@@ -187,6 +203,7 @@ static int xhci_plat_remove(struct platf
|
|
|
+ struct clk *clk = xhci->clk;
|
|
|
+
|
|
|
+ usb_remove_hcd(xhci->shared_hcd);
|
|
|
++ usb_phy_shutdown(hcd->usb_phy);
|
|
|
+ usb_put_hcd(xhci->shared_hcd);
|
|
|
+
|
|
|
+ usb_remove_hcd(hcd);
|
Imre Kaloz