3 files changed, 238 insertions, 0 deletions

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 67eb3770868..22a917302e3 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -66,6 +66,7 @@ config USB_ARCH_HAS_EHCI
         default y if ARCH_AT91SAM9G45
         default y if ARCH_MXC
         default y if ARCH_OMAP3
+        default y if CPU_SUBTYPE_SH7786
         default PCI
 
 # ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 502a7e6fef4..02ffbea0c8f 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1166,6 +1166,11 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER         ehci_mxc_driver
 #endif
 
+#ifdef CONFIG_CPU_SUBTYPE_SH7786
+#include "ehci-sh.c"
+#define PLATFORM_DRIVER         ehci_hcd_sh_driver
+#endif
+
 #ifdef CONFIG_SOC_AU1200
 #include "ehci-au1xxx.c"
 #define PLATFORM_DRIVER         ehci_hcd_au1xxx_driver
diff --git a/drivers/usb/host/ehci-sh.c b/drivers/usb/host/ehci-sh.c
new file mode 100644
index 00000000000..430b72e637f
--- /dev/null
+++ b/drivers/usb/host/ehci-sh.c
@@ -0,0 +1,232 @@
+/*
+ * SuperH EHCI host controller driver
+ *
+ * Copyright (C) 2010  Paul Mundt
+ *
+ * Based on ohci-sh.c and ehci-atmel.c.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+
+struct ehci_sh_priv {
+        struct clk *iclk, *fclk;
+        struct usb_hcd *hcd;
+};
+
+static int ehci_sh_reset(struct usb_hcd *hcd)
+{
+        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+        int ret;
+
+        ehci->caps = hcd->regs;
+        ehci->regs = hcd->regs + HC_LENGTH(ehci_readl(ehci,
+                &ehci->caps->hc_capbase));
+
+        dbg_hcs_params(ehci, "reset");
+        dbg_hcc_params(ehci, "reset");
+
+        ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
+
+        ret = ehci_halt(ehci);
+        if (unlikely(ret))
+                return ret;
+
+        ret = ehci_init(hcd);
+        if (unlikely(ret))
+                return ret;
+
+        ehci->sbrn = 0x20;
+
+        ehci_reset(ehci);
+        ehci_port_power(ehci, 0);
+
+        return ret;
+}
+
+static const struct hc_driver ehci_sh_hc_driver = {
+        .description                    = hcd_name,
+        .product_desc                   = "SuperH EHCI",
+        .hcd_priv_size                  = sizeof(struct ehci_hcd),
+
+        /*
+         * generic hardware linkage
+         */
+        .irq                            = ehci_irq,
+        .flags                          = HCD_USB2 | HCD_MEMORY,
+
+        /*
+         * basic lifecycle operations
+         */
+        .reset                          = ehci_sh_reset,
+        .start                          = ehci_run,
+        .stop                           = ehci_stop,
+        .shutdown                       = ehci_shutdown,
+
+        /*
+         * managing i/o requests and associated device resources
+         */
+        .urb_enqueue                    = ehci_urb_enqueue,
+        .urb_dequeue                    = ehci_urb_dequeue,
+        .endpoint_disable               = ehci_endpoint_disable,
+
+        /*
+         * scheduling support
+         */
+        .get_frame_number               = ehci_get_frame,
+
+        /*
+         * root hub support
+         */
+        .hub_status_data                = ehci_hub_status_data,
+        .hub_control                    = ehci_hub_control,
+
+#ifdef CONFIG_PM
+        .bus_suspend                    = ehci_bus_suspend,
+        .bus_resume                     = ehci_bus_resume,
+#endif
+
+        .relinquish_port                = ehci_relinquish_port,
+        .port_handed_over               = ehci_port_handed_over,
+};
+
+static int ehci_hcd_sh_probe(struct platform_device *pdev)
+{
+        const struct hc_driver *driver = &ehci_sh_hc_driver;
+        struct resource *res;
+        struct ehci_sh_priv *priv;
+        struct usb_hcd *hcd;
+        int irq, ret;
+
+        if (usb_disabled())
+                return -ENODEV;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev,
+                        "Found HC with no register addr. Check %s setup!\n",
+                        dev_name(&pdev->dev));
+                ret = -ENODEV;
+                goto fail_create_hcd;
+        }
+
+        irq = platform_get_irq(pdev, 0);
+        if (irq <= 0) {
+                dev_err(&pdev->dev,
+                        "Found HC with no IRQ. Check %s setup!\n",
+                        dev_name(&pdev->dev));
+                ret = -ENODEV;
+                goto fail_create_hcd;
+        }
+
+        /* initialize hcd */
+        hcd = usb_create_hcd(&ehci_sh_hc_driver, &pdev->dev,
+                             dev_name(&pdev->dev));
+        if (!hcd) {
+                ret = -ENOMEM;
+                goto fail_create_hcd;
+        }
+
+        hcd->rsrc_start = res->start;
+        hcd->rsrc_len = resource_size(res);
+
+        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
+                                driver->description)) {
+                dev_dbg(&pdev->dev, "controller already in use\n");
+                ret = -EBUSY;
+                goto fail_request_resource;
+        }
+
+        hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
+        if (hcd->regs == NULL) {
+                dev_dbg(&pdev->dev, "error mapping memory\n");
+                ret = -ENXIO;
+                goto fail_ioremap;
+        }
+
+        priv = kmalloc(sizeof(struct ehci_sh_priv), GFP_KERNEL);
+        if (!priv) {
+                dev_dbg(&pdev->dev, "error allocating priv data\n");
+                ret = -ENOMEM;
+                goto fail_alloc;
+        }
+
+        /* These are optional, we don't care if they fail */
+        priv->fclk = clk_get(&pdev->dev, "usb_fck");
+        if (IS_ERR(priv->fclk))
+                priv->fclk = NULL;
+
+        priv->iclk = clk_get(&pdev->dev, "usb_ick");
+        if (IS_ERR(priv->iclk))
+                priv->iclk = NULL;
+
+        clk_enable(priv->fclk);
+        clk_enable(priv->iclk);
+
+        ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "Failed to add hcd");
+                goto fail_add_hcd;
+        }
+
+        priv->hcd = hcd;
+        platform_set_drvdata(pdev, priv);
+
+        return ret;
+
+fail_add_hcd:
+        clk_disable(priv->iclk);
+        clk_disable(priv->fclk);
+
+        clk_put(priv->iclk);
+        clk_put(priv->fclk);
+
+        kfree(priv);
+fail_alloc:
+        iounmap(hcd->regs);
+fail_ioremap:
+        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+fail_request_resource:
+        usb_put_hcd(hcd);
+fail_create_hcd:
+        dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), ret);
+
+        return ret;
+}
+
+static int __exit ehci_hcd_sh_remove(struct platform_device *pdev)
+{
+        struct ehci_sh_priv *priv = platform_get_drvdata(pdev);
+        struct usb_hcd *hcd = priv->hcd;
+
+        usb_remove_hcd(hcd);
+        iounmap(hcd->regs);
+        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+        usb_put_hcd(hcd);
+        platform_set_drvdata(pdev, NULL);
+
+        clk_disable(priv->fclk);
+        clk_disable(priv->iclk);
+
+        clk_put(priv->fclk);
+        clk_put(priv->iclk);
+
+        kfree(priv);
+
+        return 0;
+}
+
+static struct platform_driver ehci_hcd_sh_driver = {
+        .probe          = ehci_hcd_sh_probe,
+        .remove         = __exit_p(ehci_hcd_sh_remove),
+        .shutdown       = usb_hcd_platform_shutdown,
+        .driver         = {
+                .name   = "sh_ehci",
+                .owner  = THIS_MODULE,
+        },
+};
+
+MODULE_ALIAS("platform:sh_ehci");