]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
usb: OHCI/EHCI support for Netlogic XLS processor.
authorJayachandran C <jayachandranc@netlogicmicro.com>
Thu, 4 Aug 2011 19:58:22 +0000 (01:28 +0530)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 22 Aug 2011 22:54:38 +0000 (15:54 -0700)
Add supprt for on-chip USB controller for Netlogic XLS MIPS64
SoC processor family.
Changes are:
 - update ehci-hcd.c and ohci-hcd.c to add XLS hcds
 - add ehci-xls.c: EHCI support for Netlogic XLS.
 - add ohci-xls.c: OHCI support for Netlogic XLS.

Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-xls.c [new file with mode: 0644]
drivers/usb/host/ohci-hcd.c
drivers/usb/host/ohci-xls.c [new file with mode: 0644]

index 750f60fe6a9f24dbcbc037a4479092be80c02b27..2af3e2a89efc2bde4a392d7e51191f87722d187d 100644 (file)
@@ -1296,6 +1296,11 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER                ehci_pxa168_driver
 #endif
 
+#ifdef CONFIG_NLM_XLR
+#include "ehci-xls.c"
+#define PLATFORM_DRIVER                ehci_xls_driver
+#endif
+
 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
     !defined(XILINX_OF_PLATFORM_DRIVER)
diff --git a/drivers/usb/host/ehci-xls.c b/drivers/usb/host/ehci-xls.c
new file mode 100644 (file)
index 0000000..fe74bd6
--- /dev/null
@@ -0,0 +1,161 @@
+/*
+ * EHCI HCD for Netlogic XLS processors.
+ *
+ * (C) Copyright 2011 Netlogic Microsystems Inc.
+ *
+ *  Based on various ehci-*.c drivers
+ *
+ * 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>
+
+static int ehci_xls_setup(struct usb_hcd *hcd)
+{
+       int     retval;
+       struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+
+       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");
+
+       /* cache this readonly data; minimize chip reads */
+       ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
+
+       retval = ehci_halt(ehci);
+       if (retval)
+               return retval;
+
+       /* data structure init */
+       retval = ehci_init(hcd);
+       if (retval)
+               return retval;
+
+       ehci_reset(ehci);
+
+       return retval;
+}
+
+int ehci_xls_probe_internal(const struct hc_driver *driver,
+       struct platform_device *pdev)
+{
+       struct usb_hcd  *hcd;
+       struct resource *res;
+       int retval, irq;
+
+       /* Get our IRQ from an earlier registered Platform Resource */
+       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));
+               return -ENODEV;
+       }
+
+       /* Get our Memory Handle */
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
+               dev_err(&pdev->dev, "Error: MMIO Handle %s setup!\n",
+                               dev_name(&pdev->dev));
+               return -ENODEV;
+       }
+       hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
+       if (!hcd) {
+               retval = -ENOMEM;
+               goto err1;
+       }
+
+       hcd->rsrc_start = res->start;
+       hcd->rsrc_len = res->end - res->start + 1;
+
+       if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
+                               driver->description)) {
+               dev_dbg(&pdev->dev, "controller already in use\n");
+               retval = -EBUSY;
+               goto err2;
+       }
+       hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
+
+       if (hcd->regs == NULL) {
+               dev_dbg(&pdev->dev, "error mapping memory\n");
+               retval = -EFAULT;
+               goto err3;
+       }
+
+       retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
+       if (retval != 0)
+               goto err4;
+       return retval;
+
+err4:
+       iounmap(hcd->regs);
+err3:
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+err2:
+       usb_put_hcd(hcd);
+err1:
+       dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev),
+                       retval);
+       return retval;
+}
+
+static struct hc_driver ehci_xls_hc_driver = {
+       .description    = hcd_name,
+       .product_desc   = "XLS EHCI Host Controller",
+       .hcd_priv_size  = sizeof(struct ehci_hcd),
+       .irq            = ehci_irq,
+       .flags          = HCD_USB2 | HCD_MEMORY,
+       .reset          = ehci_xls_setup,
+       .start          = ehci_run,
+       .stop           = ehci_stop,
+       .shutdown       = ehci_shutdown,
+
+       .urb_enqueue    = ehci_urb_enqueue,
+       .urb_dequeue    = ehci_urb_dequeue,
+       .endpoint_disable = ehci_endpoint_disable,
+       .endpoint_reset = ehci_endpoint_reset,
+
+       .get_frame_number = ehci_get_frame,
+
+       .hub_status_data = ehci_hub_status_data,
+       .hub_control    = ehci_hub_control,
+       .bus_suspend    = ehci_bus_suspend,
+       .bus_resume     = ehci_bus_resume,
+       .relinquish_port = ehci_relinquish_port,
+       .port_handed_over = ehci_port_handed_over,
+
+       .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
+};
+
+static int ehci_xls_probe(struct platform_device *pdev)
+{
+       if (usb_disabled())
+               return -ENODEV;
+
+       return ehci_xls_probe_internal(&ehci_xls_hc_driver, pdev);
+}
+
+static int ehci_xls_remove(struct platform_device *pdev)
+{
+       struct usb_hcd *hcd = platform_get_drvdata(pdev);
+
+       usb_remove_hcd(hcd);
+       iounmap(hcd->regs);
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+       usb_put_hcd(hcd);
+       return 0;
+}
+
+MODULE_ALIAS("ehci-xls");
+
+static struct platform_driver ehci_xls_driver = {
+       .probe          = ehci_xls_probe,
+       .remove         = ehci_xls_remove,
+       .shutdown       = usb_hcd_platform_shutdown,
+       .driver         = {
+               .name = "ehci-xls",
+       },
+};
index f9cf3f04b7424bd2299dc52f1662cdd6443e050b..34efd479e068cbd8133fbd98f8c2a2cd47efa862 100644 (file)
@@ -1114,6 +1114,11 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER                ohci_hcd_ath79_driver
 #endif
 
+#ifdef CONFIG_NLM_XLR
+#include "ohci-xls.c"
+#define PLATFORM_DRIVER                ohci_xls_driver
+#endif
+
 #if    !defined(PCI_DRIVER) &&         \
        !defined(PLATFORM_DRIVER) &&    \
        !defined(OMAP1_PLATFORM_DRIVER) &&      \
diff --git a/drivers/usb/host/ohci-xls.c b/drivers/usb/host/ohci-xls.c
new file mode 100644 (file)
index 0000000..a3a9c6f
--- /dev/null
@@ -0,0 +1,151 @@
+/*
+ * OHCI HCD for Netlogic XLS processors.
+ *
+ * (C) Copyright 2011 Netlogic Microsystems Inc.
+ *
+ *  Based on ohci-au1xxx.c, and other Linux OHCI drivers.
+ *
+ * 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/signal.h>
+
+static int ohci_xls_probe_internal(const struct hc_driver *driver,
+                       struct platform_device *dev)
+{
+       struct resource *res;
+       struct usb_hcd *hcd;
+       int retval, irq;
+
+       /* Get our IRQ from an earlier registered Platform Resource */
+       irq = platform_get_irq(dev, 0);
+       if (irq < 0) {
+               dev_err(&dev->dev, "Found HC with no IRQ\n");
+               return -ENODEV;
+       }
+
+       /* Get our Memory Handle */
+       res = platform_get_resource(dev, IORESOURCE_MEM, 0);
+       if (!res) {
+               dev_err(&dev->dev, "MMIO Handle incorrect!\n");
+               return -ENODEV;
+       }
+
+       hcd = usb_create_hcd(driver, &dev->dev, "XLS");
+       if (!hcd) {
+               retval = -ENOMEM;
+               goto err1;
+       }
+       hcd->rsrc_start = res->start;
+       hcd->rsrc_len = res->end - res->start + 1;
+
+       if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
+                       driver->description)) {
+               dev_dbg(&dev->dev, "Controller already in use\n");
+               retval = -EBUSY;
+               goto err2;
+       }
+
+       hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
+       if (hcd->regs == NULL) {
+               dev_dbg(&dev->dev, "error mapping memory\n");
+               retval = -EFAULT;
+               goto err3;
+       }
+
+       retval = usb_add_hcd(hcd, irq, IRQF_DISABLED | IRQF_SHARED);
+       if (retval != 0)
+               goto err4;
+       return retval;
+
+err4:
+       iounmap(hcd->regs);
+err3:
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+err2:
+       usb_put_hcd(hcd);
+err1:
+       dev_err(&dev->dev, "init fail, %d\n", retval);
+       return retval;
+}
+
+static int ohci_xls_reset(struct usb_hcd *hcd)
+{
+       struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+
+       ohci_hcd_init(ohci);
+       return ohci_init(ohci);
+}
+
+static int __devinit ohci_xls_start(struct usb_hcd *hcd)
+{
+       struct ohci_hcd *ohci;
+       int ret;
+
+       ohci = hcd_to_ohci(hcd);
+       ret = ohci_run(ohci);
+       if (ret < 0) {
+               err("can't start %s", hcd->self.bus_name);
+               ohci_stop(hcd);
+               return ret;
+       }
+       return 0;
+}
+
+static struct hc_driver ohci_xls_hc_driver = {
+       .description    = hcd_name,
+       .product_desc   = "XLS OHCI Host Controller",
+       .hcd_priv_size  = sizeof(struct ohci_hcd),
+       .irq            = ohci_irq,
+       .flags          = HCD_MEMORY | HCD_USB11,
+       .reset          = ohci_xls_reset,
+       .start          = ohci_xls_start,
+       .stop           = ohci_stop,
+       .shutdown       = ohci_shutdown,
+       .urb_enqueue    = ohci_urb_enqueue,
+       .urb_dequeue    = ohci_urb_dequeue,
+       .endpoint_disable = ohci_endpoint_disable,
+       .get_frame_number = ohci_get_frame,
+       .hub_status_data = ohci_hub_status_data,
+       .hub_control    = ohci_hub_control,
+#ifdef CONFIG_PM
+       .bus_suspend    = ohci_bus_suspend,
+       .bus_resume     = ohci_bus_resume,
+#endif
+       .start_port_reset = ohci_start_port_reset,
+};
+
+static int ohci_xls_probe(struct platform_device *dev)
+{
+       int ret;
+
+       pr_debug("In ohci_xls_probe");
+       if (usb_disabled())
+               return -ENODEV;
+       ret = ohci_xls_probe_internal(&ohci_xls_hc_driver, dev);
+       return ret;
+}
+
+static int ohci_xls_remove(struct platform_device *dev)
+{
+       struct usb_hcd *hcd = platform_get_drvdata(dev);
+
+       usb_remove_hcd(hcd);
+       iounmap(hcd->regs);
+       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+       usb_put_hcd(hcd);
+       return 0;
+}
+
+static struct platform_driver ohci_xls_driver = {
+       .probe          = ohci_xls_probe,
+       .remove         = ohci_xls_remove,
+       .shutdown       = usb_hcd_platform_shutdown,
+       .driver         = {
+               .name   = "ohci-xls-0",
+               .owner  = THIS_MODULE,
+       },
+};