1 --- a/drivers/usb/host/ohci-hcd.c
2 +++ b/drivers/usb/host/ohci-hcd.c
3 @@ -663,6 +663,9 @@ retry:
5 periodic_reinit (ohci);
7 + if (ohci->flags & OHCI_QUIRK_INIT_FMINTERVAL)
8 + ohci_writel (ohci, ohci->fminterval, &ohci->regs->fminterval);
10 /* some OHCI implementations are finicky about how they init.
11 * bogus values here mean not even enumeration could work.
13 @@ -1105,6 +1108,11 @@ MODULE_LICENSE ("GPL");
14 #define PLATFORM_DRIVER ohci_hcd_tilegx_driver
17 +#ifdef CONFIG_ARCH_CNS21XX
18 +#include "ohci-cns21xx.c"
19 +#define PLATFORM_DRIVER ohci_cns21xx_driver
22 #ifdef CONFIG_USB_CNS3XXX_OHCI
23 #include "ohci-cns3xxx.c"
24 #define PLATFORM_DRIVER ohci_hcd_cns3xxx_driver
26 +++ b/drivers/usb/host/ohci-cns21xx.c
29 + * Copyright (c) 2008 Cavium Networks
30 + * Copyright (c) 2010-2012 Gabor Juhos <juhosg@openwrt.org>
32 + * This file is free software; you can redistribute it and/or modify
33 + * it under the terms of the GNU General Public License, Version 2, as
34 + * published by the Free Software Foundation.
37 +#include <linux/platform_device.h>
39 +#include <mach/cns21xx.h>
41 +#define DRIVER_NAME "cns21xx-ohci"
43 +static int __devinit cns21xx_ohci_start(struct usb_hcd *hcd)
45 + struct ohci_hcd *ohci = hcd_to_ohci(hcd);
48 + ret = ohci_init(ohci);
52 + ret = ohci_run(ohci);
54 + ohci_err(ohci, "can't start %s",
55 + ohci_to_hcd(ohci)->self.bus_name);
66 +static const struct hc_driver ohci_cns21xx_hc_driver = {
67 + .description = hcd_name,
68 + .product_desc = "cns21xx-ohci",
69 + .hcd_priv_size = sizeof(struct ohci_hcd),
72 + * generic hardware linkage
75 + .flags = HCD_USB11 | HCD_MEMORY,
78 + * basic lifecycle operations
80 + .start = cns21xx_ohci_start,
82 + .shutdown = ohci_shutdown,
85 + * managing i/o requests and associated device resources
87 + .urb_enqueue = ohci_urb_enqueue,
88 + .urb_dequeue = ohci_urb_dequeue,
89 + .endpoint_disable = ohci_endpoint_disable,
92 + * scheduling support
94 + .get_frame_number = ohci_get_frame,
99 + .hub_status_data = ohci_hub_status_data,
100 + .hub_control = ohci_hub_control,
101 + .start_port_reset = ohci_start_port_reset,
104 +static void cns21xx_ohci_init_hc(void)
106 + __raw_writel(0x146, CNS21XX_OHCI_CONFIG_BASE_VIRT + 0x04);
107 + __raw_writel(0x200, CNS21XX_OHCI_CONFIG_BASE_VIRT + 0x44);
111 +static int ohci_cns21xx_probe(struct platform_device *pdev)
113 + struct usb_hcd *hcd;
114 + struct resource *res;
115 + struct ohci_hcd *ohci;
119 + if (usb_disabled())
122 + res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
124 + dev_dbg(&pdev->dev, "no IRQ specified for %s\n",
125 + dev_name(&pdev->dev));
130 + hcd = usb_create_hcd(&ohci_cns21xx_hc_driver, &pdev->dev,
131 + dev_name(&pdev->dev));
135 + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
137 + dev_dbg(&pdev->dev, "no base address specified for %s\n",
138 + dev_name(&pdev->dev));
142 + hcd->rsrc_start = res->start;
143 + hcd->rsrc_len = res->end - res->start + 1;
145 + if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
146 + dev_dbg(&pdev->dev, "controller already in use\n");
151 + hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
153 + dev_dbg(&pdev->dev, "error mapping memory\n");
155 + goto err_release_region;
158 + cns21xx_ohci_init_hc();
160 + ohci = hcd_to_ohci(hcd);
161 + ohci->flags |= OHCI_QUIRK_INIT_FMINTERVAL;
162 + ohci_hcd_init(ohci);
164 + ret = usb_add_hcd(hcd, irq, 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 ohci_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 ohci_cns21xx_driver = {
194 + .probe = ohci_cns21xx_probe,
195 + .remove = ohci_cns21xx_remove,
196 + .shutdown = usb_hcd_platform_shutdown,
198 + .owner = THIS_MODULE,
199 + .name = DRIVER_NAME,
203 +MODULE_ALIAS("platform:" DRIVER_NAME);
204 --- a/drivers/usb/host/ohci.h
205 +++ b/drivers/usb/host/ohci.h
206 @@ -405,6 +405,7 @@ struct ohci_hcd {
207 #define OHCI_QUIRK_HUB_POWER 0x100 /* distrust firmware power/oc setup */
208 #define OHCI_QUIRK_AMD_PLL 0x200 /* AMD PLL quirk*/
209 #define OHCI_QUIRK_AMD_PREFETCH 0x400 /* pre-fetch for ISO transfer */
210 +#define OHCI_QUIRK_INIT_FMINTERVAL 0x1000 /* fminterval must be initialized */
211 // there are also chip quirks/bugs in init logic
213 struct work_struct nec_work; /* Worker for NEC quirk */
214 --- a/arch/arm/Kconfig
215 +++ b/arch/arm/Kconfig
216 @@ -375,6 +375,7 @@ config ARCH_CNS21XX
218 select ARCH_REQUIRE_GPIOLIB
219 select ARM_L1_CACHE_SHIFT_4
220 + select USB_ARCH_HAS_OHCI
222 Support for Cavium Networks CNS21xx family.