1 --- a/drivers/usb/host/ehci-hcd.c
2 +++ b/drivers/usb/host/ehci-hcd.c
3 @@ -1269,6 +1269,11 @@ MODULE_LICENSE ("GPL");
4 #define PLATFORM_DRIVER ehci_octeon_driver
7 +#ifdef CONFIG_ARCH_CNS21XX
8 +#include "ehci-cns21xx.c"
9 +#define PLATFORM_DRIVER ehci_cns21xx_driver
12 #ifdef CONFIG_USB_CNS3XXX_EHCI
13 #include "ehci-cns3xxx.c"
14 #define PLATFORM_DRIVER cns3xxx_ehci_driver
16 +++ b/drivers/usb/host/ehci-cns21xx.c
19 + * Copyright (c) 2008 Cavium Networks
20 + * Copyright (c) 2010-2012 Gabor Juhos <juhosg@openwrt.org>
22 + * This file is free software; you can redistribute it and/or modify
23 + * it under the terms of the GNU General Public License, Version 2, as
24 + * published by the Free Software Foundation.
27 +#include <linux/platform_device.h>
28 +#include <linux/irq.h>
30 +#include <mach/cns21xx.h>
32 +#define DRIVER_NAME "cns21xx-ehci"
34 +static int cns21xx_ehci_reset(struct usb_hcd *hcd)
36 + struct ehci_hcd *ehci = hcd_to_ehci(hcd);
39 + ret = ehci_halt(ehci);
43 + ret = ehci_init(hcd);
48 + ehci_port_power(ehci, 0);
53 +static const struct hc_driver ehci_cns21xx_hc_driver = {
54 + .description = hcd_name,
55 + .product_desc = DRIVER_NAME,
56 + .hcd_priv_size = sizeof(struct ehci_hcd),
59 + * generic hardware linkage
62 + .flags = HCD_MEMORY | HCD_USB2,
65 + * basic lifecycle operations
67 + .reset = cns21xx_ehci_reset,
70 + .shutdown = ehci_shutdown,
73 + * managing i/o requests and associated device resources
75 + .urb_enqueue = ehci_urb_enqueue,
76 + .urb_dequeue = ehci_urb_dequeue,
77 + .endpoint_disable = ehci_endpoint_disable,
78 + .endpoint_reset = ehci_endpoint_reset,
81 + * scheduling support
83 + .get_frame_number = ehci_get_frame,
88 + .hub_status_data = ehci_hub_status_data,
89 + .hub_control = ehci_hub_control,
90 + .relinquish_port = ehci_relinquish_port,
91 + .port_handed_over = ehci_port_handed_over,
93 + .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
96 +static void cns21xx_ehci_init_hc(void)
98 + __raw_writel(0x106, CNS21XX_EHCI_CONFIG_BASE_VIRT + 0x04);
99 + __raw_writel((3 << 5) | 0x2000, CNS21XX_EHCI_CONFIG_BASE_VIRT + 0x40);
103 +static int ehci_cns21xx_probe(struct platform_device *pdev)
105 + struct usb_hcd *hcd;
106 + struct ehci_hcd *ehci;
107 + struct resource *res;
111 + if (usb_disabled())
114 + res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
116 + dev_dbg(&pdev->dev, "no IRQ specified for %s\n",
117 + dev_name(&pdev->dev));
122 + hcd = usb_create_hcd(&ehci_cns21xx_hc_driver, &pdev->dev,
123 + dev_name(&pdev->dev));
127 + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
129 + dev_dbg(&pdev->dev, "no base address specified for %s\n",
130 + dev_name(&pdev->dev));
134 + hcd->rsrc_start = res->start;
135 + hcd->rsrc_len = res->end - res->start + 1;
137 + if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
138 + dev_dbg(&pdev->dev, "controller already in use\n");
143 + hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
145 + dev_dbg(&pdev->dev, "error mapping memory\n");
147 + goto err_release_region;
150 + cns21xx_ehci_init_hc();
152 + ehci = hcd_to_ehci(hcd);
154 + ehci->caps = hcd->regs;
155 + ehci->regs = hcd->regs +
156 + HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
157 + dbg_hcs_params(ehci, "reset");
158 + dbg_hcc_params(ehci, "reset");
160 + /* cache this readonly data; minimize chip reads */
161 + ehci->hcs_params = readl(&ehci->caps->hcs_params);
164 + ret = usb_add_hcd(hcd, CNS21XX_IRQ_EHCI, IRQF_DISABLED);
168 + platform_set_drvdata(pdev, hcd);
172 + iounmap(hcd->regs);
174 + release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
180 +static int ehci_cns21xx_remove(struct platform_device *pdev)
182 + struct usb_hcd *hcd = platform_get_drvdata(pdev);
184 + usb_remove_hcd(hcd);
185 + iounmap(hcd->regs);
186 + release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
188 + platform_set_drvdata(pdev, NULL);
193 +static struct platform_driver ehci_cns21xx_driver = {
194 + .probe = ehci_cns21xx_probe,
195 + .remove = ehci_cns21xx_remove,
196 + .shutdown = usb_hcd_platform_shutdown,
198 + .owner = THIS_MODULE,
199 + .name = DRIVER_NAME,
203 +MODULE_ALIAS("platform:" DRIVER_NAME);
204 --- a/arch/arm/Kconfig
205 +++ b/arch/arm/Kconfig
206 @@ -376,6 +376,7 @@ config ARCH_CNS21XX
207 select ARCH_REQUIRE_GPIOLIB
208 select ARM_L1_CACHE_SHIFT_4
209 select USB_ARCH_HAS_OHCI
210 + select USB_ARCH_HAS_EHCI
212 Support for Cavium Networks CNS21xx family.