aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-03-26 14:49:26 +0000
committerJohn Crispin <john@openwrt.org>2015-03-26 14:49:26 +0000
commit2cedb63d8493b1e68c1792c860e94924c5ee7c31 (patch)
treee0836a752c46d04f7233846be6bd8f63ebe45914
parentf6eff33b8dd6755c503f7745ef0b10f6d07f4999 (diff)
downloadupstream-2cedb63d8493b1e68c1792c860e94924c5ee7c31.tar.gz
upstream-2cedb63d8493b1e68c1792c860e94924c5ee7c31.tar.bz2
upstream-2cedb63d8493b1e68c1792c860e94924c5ee7c31.zip
ralink: the xhci patch broke ehci Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 45027
-rw-r--r--target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch61
1 files changed, 0 insertions, 61 deletions
diff --git a/target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch b/target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch
index d9d61ffa5c..62c0def4f1 100644
--- a/target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch
+++ b/target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch
@@ -99,33 +99,6 @@
obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o
obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
---- a/drivers/usb/host/ehci-platform.c
-+++ b/drivers/usb/host/ehci-platform.c
-@@ -33,6 +33,8 @@
- #include <linux/usb.h>
- #include <linux/usb/hcd.h>
- #include <linux/usb/ehci_pdriver.h>
-+#include <linux/usb/phy.h>
-+#include <linux/usb/otg.h>
-
- #include "ehci.h"
-
-@@ -255,6 +257,15 @@ static int ehci_platform_probe(struct platform_device *dev)
- hcd->rsrc_start = res_mem->start;
- hcd->rsrc_len = resource_size(res_mem);
-
-+#ifdef CONFIG_USB_PHY
-+ hcd->phy = devm_usb_get_phy(&dev->dev, USB_PHY_TYPE_USB2);
-+ if (!IS_ERR_OR_NULL(hcd->phy)) {
-+ otg_set_host(hcd->phy->otg,
-+ &hcd->self);
-+ usb_phy_init(hcd->phy);
-+ }
-+#endif
-+
- hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
- if (IS_ERR(hcd->regs)) {
- err = PTR_ERR(hcd->regs);
--- /dev/null
+++ b/drivers/usb/host/mtk-phy-7621.c
@@ -0,0 +1,445 @@
@@ -3796,40 +3769,6 @@
+/***********************************/
+#endif
+
---- a/drivers/usb/host/ohci-platform.c
-+++ b/drivers/usb/host/ohci-platform.c
-@@ -27,7 +27,10 @@
- #include <linux/reset.h>
- #include <linux/usb/ohci_pdriver.h>
- #include <linux/usb.h>
-+#include <linux/usb/phy.h>
- #include <linux/usb/hcd.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/of.h>
-
- #include "ohci.h"
-
-@@ -41,6 +44,7 @@ struct ohci_platform_priv {
- struct phy *phy;
- };
-
-+static struct usb_ohci_pdata ohci_platform_defaults;
- static const char hcd_name[] = "ohci-platform";
-
- static int ohci_platform_reset(struct usb_hcd *hcd)
-@@ -239,6 +243,12 @@ static int ohci_platform_probe(struct platform_device *dev)
- hcd->rsrc_start = res_mem->start;
- hcd->rsrc_len = resource_size(res_mem);
-
-+#ifdef CONFIG_USB_PHY
-+ hcd->phy = devm_usb_get_phy(&dev->dev, USB_PHY_TYPE_USB2);
-+ if (!IS_ERR_OR_NULL(hcd->phy))
-+ usb_phy_init(hcd->phy);
-+#endif
-+
- hcd->regs = devm_ioremap_resource(&dev->dev, res_mem);
- if (IS_ERR(hcd->regs)) {
- err = PTR_ERR(hcd->regs);
--- a/drivers/usb/host/pci-quirks.h
+++ b/drivers/usb/host/pci-quirks.h
@@ -1,7 +1,7 @@