X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Fmvebu%2Fpatches-4.0%2F700-usb_xhci_plat_phy_support.patch;fp=target%2Flinux%2Fmvebu%2Fpatches-4.0%2F700-usb_xhci_plat_phy_support.patch;h=0000000000000000000000000000000000000000;hp=a315b8775f70fcff24426ae6656701f481fa074e;hb=0dc62d5278b9e2e4de3d076c3a403dd6cbab5c67;hpb=64afbd00b0d618e60d5d3a4e558f173a6a2a3e70

diff --git a/target/linux/mvebu/patches-4.0/700-usb_xhci_plat_phy_support.patch b/target/linux/mvebu/patches-4.0/700-usb_xhci_plat_phy_support.patch
deleted file mode 100644
index a315b8775f..0000000000
--- a/target/linux/mvebu/patches-4.0/700-usb_xhci_plat_phy_support.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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>
- 
-@@ -155,12 +156,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);
- 
-@@ -184,6 +200,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);