[openwrt/staging/mkresin.git] / target / linux / ramips / patches-3.10 / 0120-USB-add-OHCI-EHCI-OF-binding.patch

From 08d438b69f3023f16b044b07eebee6b9c2302f60 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Sun, 14 Jul 2013 23:34:53 +0200
Subject: [PATCH 120/133] 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, 51 insertions(+), 10 deletions(-)

--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -10,6 +10,8 @@ obj-$(CONFIG_USB_DWC3)                += dwc3/
 
 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/
@@ -44,7 +46,6 @@ obj-$(CONFIG_USB_MICROTEK)    += image/
 obj-$(CONFIG_USB_SERIAL)       += serial/
 
 obj-$(CONFIG_USB)              += misc/
-obj-$(CONFIG_USB_PHY)          += phy/
 obj-$(CONFIG_EARLY_PRINTK_DBGP)        += early/
 
 obj-$(CONFIG_USB_ATM)          += atm/
--- 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"
 
@@ -118,6 +120,15 @@ static int ehci_platform_probe(struct pl
        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);
@@ -155,6 +166,9 @@ static int ehci_platform_remove(struct p
        if (pdata == &ehci_platform_defaults)
                dev->dev.platform_data = NULL;
 
+       if (pdata == &ehci_platform_defaults)
+               dev->dev.platform_data = NULL;
+
        return 0;
 }
 
@@ -199,9 +213,8 @@ static int ehci_platform_resume(struct d
 #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", },
        {}
 };
 
@@ -225,7 +238,7 @@ static struct platform_driver ehci_platf
                .owner  = THIS_MODULE,
                .name   = "ehci-platform",
                .pm     = &ehci_platform_pm_ops,
-               .of_match_table = of_match_ptr(vt8500_ehci_ids),
+               .of_match_table = of_match_ptr(ralink_ehci_ids),
        }
 };
 
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -16,6 +16,10 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/usb/ohci_pdriver.h>
+#include <linux/dma-mapping.h>
+#include <linux/of.h>
+
+static struct usb_ohci_pdata ohci_platform_defaults;
 
 static int ohci_platform_reset(struct usb_hcd *hcd)
 {
@@ -88,14 +92,22 @@ static int ohci_platform_probe(struct pl
 {
        struct usb_hcd *hcd;
        struct resource *res_mem;
-       struct usb_ohci_pdata *pdata = dev->dev.platform_data;
+       struct usb_ohci_pdata *pdata;
        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;
@@ -128,6 +140,12 @@ static int ohci_platform_probe(struct pl
        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);
@@ -162,6 +180,9 @@ static int ohci_platform_remove(struct p
        if (pdata->power_off)
                pdata->power_off(dev);
 
+       if (pdata == &ohci_platform_defaults)
+               dev->dev.platform_data = NULL;
+
        return 0;
 }
 
@@ -201,6 +222,11 @@ static int ohci_platform_resume(struct d
 #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 },
        { }
@@ -221,5 +247,6 @@ static struct platform_driver ohci_platf
                .owner  = THIS_MODULE,
                .name   = "ohci-platform",
                .pm     = &ohci_platform_pm_ops,
+               .of_match_table = of_match_ptr(ralink_ohci_ids),
        }
 };