diff options
Diffstat (limited to 'target/linux/ramips/patches-3.14/0038-USB-add-OHCI-EHCI-OF-binding.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.14/0038-USB-add-OHCI-EHCI-OF-binding.patch | 191 |
1 files changed, 191 insertions, 0 deletions
diff --git a/target/linux/ramips/patches-3.14/0038-USB-add-OHCI-EHCI-OF-binding.patch b/target/linux/ramips/patches-3.14/0038-USB-add-OHCI-EHCI-OF-binding.patch new file mode 100644 index 0000000000..87d2c30232 --- /dev/null +++ b/target/linux/ramips/patches-3.14/0038-USB-add-OHCI-EHCI-OF-binding.patch @@ -0,0 +1,191 @@ +From ffb27de4760595c356ef619c97f25722c8db28e7 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Sun, 27 Jul 2014 09:49:07 +0100 +Subject: [PATCH 38/57] USB: add OHCI/EHCI OF binding + +based on f3bc64d6d1f21c1b92d75f233a37b75d77af6963 + +Signed-off-by: John Crispin <blogic@openwrt.org> +--- + drivers/usb/Makefile | 3 ++- + drivers/usb/host/ehci-platform.c | 21 +++++++++++++++++---- + drivers/usb/host/ohci-platform.c | 37 +++++++++++++++++++++++++++++++------ + 3 files changed, 50 insertions(+), 11 deletions(-) + +diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile +index 1ae2bf3..aaa15d9 100644 +--- a/drivers/usb/Makefile ++++ b/drivers/usb/Makefile +@@ -11,6 +11,8 @@ obj-$(CONFIG_USB_DWC2) += dwc2/ + + obj-$(CONFIG_USB_MON) += mon/ + ++obj-$(CONFIG_USB_PHY) += phy/ ++ + obj-$(CONFIG_PCI) += host/ + obj-$(CONFIG_USB_EHCI_HCD) += host/ + obj-$(CONFIG_USB_ISP116X_HCD) += host/ +@@ -41,7 +43,6 @@ obj-$(CONFIG_USB_TMC) += class/ + obj-$(CONFIG_USB_STORAGE) += storage/ + obj-$(CONFIG_USB) += storage/ + +-obj-$(CONFIG_USB_MDC800) += image/ + obj-$(CONFIG_USB_MICROTEK) += image/ + + obj-$(CONFIG_USB_SERIAL) += serial/ +diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c +index 01536cf..1b9a8f4 100644 +--- a/drivers/usb/host/ehci-platform.c ++++ b/drivers/usb/host/ehci-platform.c +@@ -29,6 +29,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" + +@@ -123,6 +125,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); +@@ -160,6 +171,9 @@ static int ehci_platform_remove(struct platform_device *dev) + if (pdata == &ehci_platform_defaults) + dev->dev.platform_data = NULL; + ++ if (pdata == &ehci_platform_defaults) ++ dev->dev.platform_data = NULL; ++ + return 0; + } + +@@ -204,9 +218,8 @@ static int ehci_platform_resume(struct device *dev) + #define ehci_platform_resume NULL + #endif /* CONFIG_PM */ + +-static const struct of_device_id vt8500_ehci_ids[] = { +- { .compatible = "via,vt8500-ehci", }, +- { .compatible = "wm,prizm-ehci", }, ++static const struct of_device_id ralink_ehci_ids[] = { ++ { .compatible = "ralink,rt3xxx-ehci", }, + {} + }; + +@@ -230,7 +243,7 @@ static struct platform_driver ehci_platform_driver = { + .owner = THIS_MODULE, + .name = "ehci-platform", + .pm = &ehci_platform_pm_ops, +- .of_match_table = vt8500_ehci_ids, ++ .of_match_table = ralink_ehci_ids, + } + }; + +diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c +index 68f674c..2a73fed 100644 +--- a/drivers/usb/host/ohci-platform.c ++++ b/drivers/usb/host/ohci-platform.c +@@ -23,17 +23,20 @@ + #include <linux/usb/ohci_pdriver.h> + #include <linux/usb.h> + #include <linux/usb/hcd.h> ++#include <linux/dma-mapping.h> ++#include <linux/of.h> + + #include "ohci.h" + + #define DRIVER_DESC "OHCI generic platform driver" + ++static struct usb_ohci_pdata ohci_platform_defaults; + static const char hcd_name[] = "ohci-platform"; + + static int ohci_platform_reset(struct usb_hcd *hcd) + { + struct platform_device *pdev = to_platform_device(hcd->self.controller); +- struct usb_ohci_pdata *pdata = dev_get_platdata(&pdev->dev); ++ struct usb_ohci_pdata *pdata; + struct ohci_hcd *ohci = hcd_to_ohci(hcd); + + if (pdata->big_endian_desc) +@@ -63,11 +66,18 @@ static int ohci_platform_probe(struct platform_device *dev) + int irq; + int err = -ENOMEM; + +- if (!pdata) { +- WARN_ON(1); +- return -ENODEV; +- } +- ++ /* ++ * use reasonable defaults so platforms don't have to provide these. ++ * with DT probing on ARM, none of these are set. ++ */ ++ if (!dev->dev.platform_data) ++ dev->dev.platform_data = &ohci_platform_defaults; ++ if (!dev->dev.dma_mask) ++ dev->dev.dma_mask = &dev->dev.coherent_dma_mask; ++ if (!dev->dev.coherent_dma_mask) ++ dev->dev.coherent_dma_mask = DMA_BIT_MASK(32); ++ ++ pdata = dev->dev.platform_data; + if (usb_disabled()) + return -ENODEV; + +@@ -99,6 +109,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); +@@ -134,6 +150,9 @@ static int ohci_platform_remove(struct platform_device *dev) + if (pdata->power_off) + pdata->power_off(dev); + ++ if (pdata == &ohci_platform_defaults) ++ dev->dev.platform_data = NULL; ++ + return 0; + } + +@@ -180,6 +199,11 @@ static int ohci_platform_resume(struct device *dev) + #define ohci_platform_resume NULL + #endif /* CONFIG_PM */ + ++static const struct of_device_id ralink_ohci_ids[] = { ++ { .compatible = "ralink,rt3xxx-ohci", }, ++ {} ++}; ++ + static const struct platform_device_id ohci_platform_table[] = { + { "ohci-platform", 0 }, + { } +@@ -200,6 +224,7 @@ static struct platform_driver ohci_platform_driver = { + .owner = THIS_MODULE, + .name = "ohci-platform", + .pm = &ohci_platform_pm_ops, ++ .of_match_table = of_match_ptr(ralink_ohci_ids), + } + }; + +-- +1.7.10.4 + |