brcm47xx: add patches for kernel 2.6.36
[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-2.6.36 / 022-USB-Add-ehci-ssb-driver.patch
1 From ad224c0d5fa0fc05f8aaef3c19fc9b4eb275a5d2 Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Sun, 18 Jul 2010 21:29:40 +0200
4 Subject: [PATCH 2/2] USB: Add ehci ssb driver
5
6 Support for the Sonics Silicon Backplane (SSB) attached Broadcom USB EHCI core.
7
8 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
9 ---
10 drivers/usb/host/Kconfig | 13 ++
11 drivers/usb/host/ehci-hcd.c | 22 ++++-
12 drivers/usb/host/ehci-ssb.c | 255 +++++++++++++++++++++++++++++++++++++++++++
13 3 files changed, 288 insertions(+), 2 deletions(-)
14 create mode 100644 drivers/usb/host/ehci-ssb.c
15
16 --- a/drivers/usb/host/Kconfig
17 +++ b/drivers/usb/host/Kconfig
18 @@ -153,6 +153,19 @@ config USB_OXU210HP_HCD
19 To compile this driver as a module, choose M here: the
20 module will be called oxu210hp-hcd.
21
22 +config USB_EHCI_HCD_SSB
23 + bool "EHCI support for Broadcom SSB EHCI core"
24 + depends on USB_EHCI_HCD && (SSB = y || SSB = USB_EHCI_HCD) && EXPERIMENTAL
25 + default n
26 + ---help---
27 + Support for the Sonics Silicon Backplane (SSB) attached
28 + Broadcom USB EHCI core.
29 +
30 + This device is present in some embedded devices with
31 + Broadcom based SSB bus.
32 +
33 + If unsure, say N.
34 +
35 config USB_ISP116X_HCD
36 tristate "ISP116X HCD support"
37 depends on USB
38 --- a/drivers/usb/host/ehci-hcd.c
39 +++ b/drivers/usb/host/ehci-hcd.c
40 @@ -1197,9 +1197,14 @@ MODULE_LICENSE ("GPL");
41 #define PLATFORM_DRIVER ehci_atmel_driver
42 #endif
43
44 +#ifdef CONFIG_USB_EHCI_HCD_SSB
45 +#include "ehci-ssb.c"
46 +#define SSB_EHCI_DRIVER ssb_ehci_driver
47 +#endif
48 +
49 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
50 !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
51 - !defined(XILINX_OF_PLATFORM_DRIVER)
52 + !defined(XILINX_OF_PLATFORM_DRIVER) && !defined(SSB_EHCI_DRIVER)
53 #error "missing bus glue for ehci-hcd"
54 #endif
55
56 @@ -1259,10 +1264,20 @@ static int __init ehci_hcd_init(void)
57 if (retval < 0)
58 goto clean4;
59 #endif
60 +
61 +#ifdef SSB_EHCI_DRIVER
62 + retval = ssb_driver_register(&SSB_EHCI_DRIVER);
63 + if (retval < 0)
64 + goto clean5;
65 +#endif
66 return retval;
67
68 +#ifdef SSB_EHCI_DRIVER
69 + /* ssb_driver_unregister(&SSB_EHCI_DRIVER); */
70 +clean5:
71 +#endif
72 #ifdef XILINX_OF_PLATFORM_DRIVER
73 - /* of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER); */
74 + of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER);
75 clean4:
76 #endif
77 #ifdef OF_PLATFORM_DRIVER
78 @@ -1293,6 +1308,9 @@ module_init(ehci_hcd_init);
79
80 static void __exit ehci_hcd_cleanup(void)
81 {
82 +#ifdef SSB_EHCI_DRIVER
83 + ssb_driver_unregister(&SSB_EHCI_DRIVER);
84 +#endif
85 #ifdef XILINX_OF_PLATFORM_DRIVER
86 of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER);
87 #endif
88 --- /dev/null
89 +++ b/drivers/usb/host/ehci-ssb.c
90 @@ -0,0 +1,255 @@
91 +/*
92 + * Sonics Silicon Backplane
93 + * Broadcom USB-core EHCI driver (SSB bus glue)
94 + *
95 + * Copyright 2007 Steven Brown <sbrown@cortland.com>
96 + * Copyright 2010 Hauke Mehrtens <hauke@hauke-m.de>
97 + *
98 + * Derived from the OHCI-SSB driver
99 + * Copyright 2007 Michael Buesch <mb@bu3sch.de>
100 + *
101 + * Derived from the EHCI-PCI driver
102 + * Copyright (c) 2000-2004 by David Brownell
103 + *
104 + * Derived from the OHCI-PCI driver
105 + * Copyright 1999 Roman Weissgaerber
106 + * Copyright 2000-2002 David Brownell
107 + * Copyright 1999 Linus Torvalds
108 + * Copyright 1999 Gregory P. Smith
109 + *
110 + * Derived from the USBcore related parts of Broadcom-SB
111 + * Copyright 2005 Broadcom Corporation
112 + *
113 + * Licensed under the GNU/GPL. See COPYING for details.
114 + */
115 +#include <linux/ssb/ssb.h>
116 +
117 +
118 +struct ssb_ehci_device {
119 + struct ehci_hcd ehci; /* _must_ be at the beginning. */
120 +};
121 +
122 +static inline
123 +struct ssb_ehci_device *hcd_to_ssb_ehci(struct usb_hcd *hcd)
124 +{
125 + return (struct ssb_ehci_device *)(hcd->hcd_priv);
126 +}
127 +
128 +static int ssb_ehci_reset(struct usb_hcd *hcd)
129 +{
130 + struct ehci_hcd *ehci = hcd_to_ehci(hcd);
131 + int err;
132 +
133 + ehci->caps = hcd->regs;
134 + ehci->regs = hcd->regs +
135 + HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
136 +
137 + dbg_hcs_params(ehci, "reset");
138 + dbg_hcc_params(ehci, "reset");
139 +
140 + ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
141 +
142 + err = ehci_halt(ehci);
143 +
144 + if (err)
145 + return err;
146 +
147 + err = ehci_init(hcd);
148 +
149 + if (err)
150 + return err;
151 +
152 + ehci_reset(ehci);
153 +
154 + return err;
155 +}
156 +
157 +static const struct hc_driver ssb_ehci_hc_driver = {
158 + .description = "ssb-usb-ehci",
159 + .product_desc = "SSB EHCI Controller",
160 + .hcd_priv_size = sizeof(struct ssb_ehci_device),
161 +
162 + .irq = ehci_irq,
163 + .flags = HCD_MEMORY | HCD_USB2,
164 +
165 + .reset = ssb_ehci_reset,
166 + .start = ehci_run,
167 + .stop = ehci_stop,
168 + .shutdown = ehci_shutdown,
169 +
170 + .urb_enqueue = ehci_urb_enqueue,
171 + .urb_dequeue = ehci_urb_dequeue,
172 + .endpoint_disable = ehci_endpoint_disable,
173 + .endpoint_reset = ehci_endpoint_reset,
174 +
175 + .get_frame_number = ehci_get_frame,
176 +
177 + .hub_status_data = ehci_hub_status_data,
178 + .hub_control = ehci_hub_control,
179 +#if defined(CONFIG_PM)
180 + .bus_suspend = ehci_bus_suspend,
181 + .bus_resume = ehci_bus_resume,
182 +#endif
183 + .relinquish_port = ehci_relinquish_port,
184 + .port_handed_over = ehci_port_handed_over,
185 +
186 + .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
187 +};
188 +
189 +static void ssb_ehci_detach(struct ssb_device *dev)
190 +{
191 + struct usb_hcd *hcd = ssb_get_drvdata(dev);
192 +
193 + if (hcd->driver->shutdown)
194 + hcd->driver->shutdown(hcd);
195 + usb_remove_hcd(hcd);
196 + iounmap(hcd->regs);
197 + release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
198 + usb_put_hcd(hcd);
199 + ssb_device_disable(dev, 0);
200 +}
201 +
202 +static int ssb_ehci_attach(struct ssb_device *dev)
203 +{
204 + struct ssb_ehci_device *ehcidev;
205 + struct usb_hcd *hcd;
206 + int err = -ENOMEM;
207 + u32 tmp;
208 +
209 + if (dma_set_mask(dev->dma_dev, DMA_BIT_MASK(32)) ||
210 + dma_set_coherent_mask(dev->dma_dev, DMA_BIT_MASK(32)))
211 + return -EOPNOTSUPP;
212 +
213 + /*
214 + * USB 2.0 special considerations:
215 + *
216 + * In addition to the standard SSB reset sequence, the Host Control
217 + * Register must be programmed to bring the USB core and various phy
218 + * components out of reset.
219 + */
220 + ssb_device_enable(dev, 0);
221 + ssb_write32(dev, 0x200, 0x7ff);
222 +
223 + /* Change Flush control reg */
224 + tmp = ssb_read32(dev, 0x400);
225 + tmp &= ~8;
226 + ssb_write32(dev, 0x400, tmp);
227 + tmp = ssb_read32(dev, 0x400);
228 +
229 + /* Change Shim control reg */
230 + tmp = ssb_read32(dev, 0x304);
231 + tmp &= ~0x100;
232 + ssb_write32(dev, 0x304, tmp);
233 + tmp = ssb_read32(dev, 0x304);
234 +
235 + udelay(1);
236 +
237 + /* Work around for 5354 failures */
238 + if (dev->id.revision == 2 && dev->bus->chip_id == 0x5354) {
239 + /* Change syn01 reg */
240 + tmp = 0x00fe00fe;
241 + ssb_write32(dev, 0x894, tmp);
242 +
243 + /* Change syn03 reg */
244 + tmp = ssb_read32(dev, 0x89c);
245 + tmp |= 0x1;
246 + ssb_write32(dev, 0x89c, tmp);
247 + }
248 +
249 + hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev,
250 + dev_name(dev->dev));
251 + if (!hcd)
252 + goto err_dev_disable;
253 +
254 + ehcidev = hcd_to_ssb_ehci(hcd);
255 + tmp = ssb_read32(dev, SSB_ADMATCH0);
256 + hcd->rsrc_start = ssb_admatch_base(tmp) + 0x800; /* ehci core offset */
257 + hcd->rsrc_len = 0x100; /* ehci reg block size */
258 + /*
259 + * start & size modified per sbutils.c
260 + */
261 + hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
262 + if (!hcd->regs)
263 + goto err_put_hcd;
264 + err = usb_add_hcd(hcd, dev->irq, IRQF_DISABLED | IRQF_SHARED);
265 + if (err)
266 + goto err_iounmap;
267 +
268 + ssb_set_drvdata(dev, hcd);
269 +
270 + return err;
271 +
272 +err_iounmap:
273 + iounmap(hcd->regs);
274 +err_put_hcd:
275 + usb_put_hcd(hcd);
276 +err_dev_disable:
277 + ssb_device_disable(dev, 0);
278 + return err;
279 +}
280 +
281 +static int ssb_ehci_probe(struct ssb_device *dev,
282 + const struct ssb_device_id *id)
283 +{
284 + int err;
285 + u16 chipid_top;
286 +
287 + /* USBcores are only connected on embedded devices. */
288 + chipid_top = (dev->bus->chip_id & 0xFF00);
289 + if (chipid_top != 0x4700 && chipid_top != 0x5300)
290 + return -ENODEV;
291 +
292 + /* TODO: Probably need checks here; is the core connected? */
293 +
294 + if (usb_disabled())
295 + return -ENODEV;
296 +
297 + err = ssb_ehci_attach(dev);
298 +
299 + return err;
300 +}
301 +
302 +static void ssb_ehci_remove(struct ssb_device *dev)
303 +{
304 + ssb_ehci_detach(dev);
305 +}
306 +
307 +#ifdef CONFIG_PM
308 +
309 +static int ssb_ehci_suspend(struct ssb_device *dev, pm_message_t state)
310 +{
311 + ssb_device_disable(dev, 0);
312 +
313 + return 0;
314 +}
315 +
316 +static int ssb_ehci_resume(struct ssb_device *dev)
317 +{
318 + struct usb_hcd *hcd = ssb_get_drvdata(dev);
319 + struct ssb_ehci_device *ehcidev = hcd_to_ssb_ehci(hcd);
320 +
321 + ssb_device_enable(dev, 0);
322 +
323 + ehci_finish_controller_resume(hcd);
324 + return 0;
325 +}
326 +
327 +#else /* !CONFIG_PM */
328 +#define ssb_ehci_suspend NULL
329 +#define ssb_ehci_resume NULL
330 +#endif /* CONFIG_PM */
331 +
332 +static const struct ssb_device_id ssb_ehci_table[] = {
333 + SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
334 + SSB_DEVTABLE_END
335 +};
336 +MODULE_DEVICE_TABLE(ssb, ssb_ehci_table);
337 +
338 +static struct ssb_driver ssb_ehci_driver = {
339 + .name = KBUILD_MODNAME,
340 + .id_table = ssb_ehci_table,
341 + .probe = ssb_ehci_probe,
342 + .remove = ssb_ehci_remove,
343 + .suspend = ssb_ehci_suspend,
344 + .resume = ssb_ehci_resume,
345 +};