brcm47xx: add kernel 2.6.35 preliminary support
[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-2.6.35 / 270-ehci-ssb.patch
1 ---
2 drivers/usb/host/Kconfig | 13 ++
3 drivers/usb/host/ehci-hcd.c | 12 ++
4 drivers/usb/host/ehci-ssb.c | 201 ++++++++++++++++++++++++++++++++++++++++++++
5 drivers/usb/host/ohci-ssb.c | 23 +++++
6 4 files changed, 247 insertions(+), 2 deletions(-)
7
8 --- a/drivers/usb/host/Kconfig
9 +++ b/drivers/usb/host/Kconfig
10 @@ -150,6 +150,19 @@ config USB_OXU210HP_HCD
11 To compile this driver as a module, choose M here: the
12 module will be called oxu210hp-hcd.
13
14 +config USB_EHCI_HCD_SSB
15 + bool "EHCI support for Broadcom SSB EHCI core"
16 + depends on USB_EHCI_HCD && SSB && EXPERIMENTAL
17 + default n
18 + ---help---
19 + Support for the Sonics Silicon Backplane (SSB) attached
20 + Broadcom USB EHCI core.
21 +
22 + This device is present in some embedded devices with
23 + Broadcom based SSB bus.
24 +
25 + If unsure, say N.
26 +
27 config USB_ISP116X_HCD
28 tristate "ISP116X HCD support"
29 depends on USB
30 --- a/drivers/usb/host/ehci-hcd.c
31 +++ b/drivers/usb/host/ehci-hcd.c
32 @@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL");
33 #define PLATFORM_DRIVER ehci_atmel_driver
34 #endif
35
36 +#ifdef CONFIG_USB_EHCI_HCD_SSB
37 +#include "ehci-ssb.c"
38 +#define SSB_EHCI_DRIVER ssb_ehci_driver
39 +#endif
40 +
41 #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
42 !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
43 !defined(XILINX_OF_PLATFORM_DRIVER)
44 --- /dev/null
45 +++ b/drivers/usb/host/ehci-ssb.c
46 @@ -0,0 +1,158 @@
47 +/*
48 + * Sonics Silicon Backplane
49 + * Broadcom USB-core EHCI driver (SSB bus glue)
50 + *
51 + * Copyright 2007 Steven Brown <sbrown@cortland.com>
52 + *
53 + * Derived from the OHCI-SSB driver
54 + * Copyright 2007 Michael Buesch <mb@bu3sch.de>
55 + *
56 + * Derived from the EHCI-PCI driver
57 + * Copyright (c) 2000-2004 by David Brownell
58 + *
59 + * Derived from the OHCI-PCI driver
60 + * Copyright 1999 Roman Weissgaerber
61 + * Copyright 2000-2002 David Brownell
62 + * Copyright 1999 Linus Torvalds
63 + * Copyright 1999 Gregory P. Smith
64 + *
65 + * Derived from the USBcore related parts of Broadcom-SB
66 + * Copyright 2005 Broadcom Corporation
67 + *
68 + * Licensed under the GNU/GPL. See COPYING for details.
69 + */
70 +#include <linux/ssb/ssb.h>
71 +
72 +#define SSB_OHCI_TMSLOW_HOSTMODE (1 << 29)
73 +
74 +struct ssb_ehci_device {
75 + struct ehci_hcd ehci; /* _must_ be at the beginning. */
76 +
77 + u32 enable_flags;
78 +};
79 +
80 +static inline
81 +struct ssb_ehci_device *hcd_to_ssb_ehci(struct usb_hcd *hcd)
82 +{
83 + return (struct ssb_ehci_device *)(hcd->hcd_priv);
84 +}
85 +
86 +static int ssb_ehci_reset(struct usb_hcd *hcd)
87 +{
88 + struct ehci_hcd *ehci = hcd_to_ehci(hcd);
89 + int err;
90 +
91 + ehci->caps = hcd->regs;
92 + ehci->regs = hcd->regs +
93 + HC_LENGTH(ehci_readl(ehci, &ehci->caps->hc_capbase));
94 +
95 + dbg_hcs_params(ehci, "reset");
96 + dbg_hcc_params(ehci, "reset");
97 +
98 + ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
99 +
100 + err = ehci_halt(ehci);
101 +
102 + if (err)
103 + return err;
104 +
105 + err = ehci_init(hcd);
106 +
107 + if (err)
108 + return err;
109 +
110 + ehci_reset(ehci);
111 +
112 + return err;
113 +}
114 +
115 +static const struct hc_driver ssb_ehci_hc_driver = {
116 + .description = "ssb-usb-ehci",
117 + .product_desc = "SSB EHCI Controller",
118 + .hcd_priv_size = sizeof(struct ssb_ehci_device),
119 +
120 + .irq = ehci_irq,
121 + .flags = HCD_MEMORY | HCD_USB2,
122 +
123 + .reset = ssb_ehci_reset,
124 + .start = ehci_run,
125 + .stop = ehci_stop,
126 + .shutdown = ehci_shutdown,
127 +
128 + .urb_enqueue = ehci_urb_enqueue,
129 + .urb_dequeue = ehci_urb_dequeue,
130 + .endpoint_disable = ehci_endpoint_disable,
131 + .endpoint_reset = ehci_endpoint_reset,
132 +
133 + .get_frame_number = ehci_get_frame,
134 +
135 + .hub_status_data = ehci_hub_status_data,
136 + .hub_control = ehci_hub_control,
137 + .bus_suspend = ehci_bus_suspend,
138 + .bus_resume = ehci_bus_resume,
139 + .relinquish_port = ehci_relinquish_port,
140 + .port_handed_over = ehci_port_handed_over,
141 +
142 + .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
143 +};
144 +
145 +static void ssb_ehci_detach(struct ssb_device *dev, struct usb_hcd *hcd)
146 +{
147 + if (hcd->driver->shutdown)
148 + hcd->driver->shutdown(hcd);
149 +
150 + usb_remove_hcd(hcd);
151 +
152 + iounmap(hcd->regs);
153 + release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
154 +
155 + usb_put_hcd(hcd);
156 +}
157 +EXPORT_SYMBOL_GPL(ssb_ehci_detach);
158 +
159 +static int ssb_ehci_attach(struct ssb_device *dev, struct usb_hcd **ehci_hcd)
160 +{
161 + struct ssb_ehci_device *ehcidev;
162 + struct usb_hcd *hcd;
163 + int err = -ENOMEM;
164 + u32 tmp, flags = 0;
165 +
166 + hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev,
167 + dev_name(dev->dev));
168 + if (!hcd)
169 + goto err_dev_disable;
170 +
171 + ehcidev = hcd_to_ssb_ehci(hcd);
172 + ehcidev->enable_flags = flags;
173 + tmp = ssb_read32(dev, SSB_ADMATCH0);
174 + hcd->rsrc_start = ssb_admatch_base(tmp) + 0x800; /* ehci core offset */
175 + hcd->rsrc_len = 0x100; /* ehci reg block size */
176 + /*
177 + * start & size modified per sbutils.c
178 + */
179 + hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
180 + if (!hcd->regs)
181 + goto err_put_hcd;
182 + err = usb_add_hcd(hcd, dev->irq, IRQF_SHARED | IRQF_DISABLED);
183 + if (err)
184 + goto err_iounmap;
185 +
186 + *ehci_hcd = hcd;
187 +
188 + return err;
189 +
190 +err_iounmap:
191 + iounmap(hcd->regs);
192 +err_put_hcd:
193 + usb_put_hcd(hcd);
194 +err_dev_disable:
195 + ssb_device_disable(dev, flags);
196 + return err;
197 +}
198 +EXPORT_SYMBOL_GPL(ssb_ehci_attach);
199 +
200 +static const struct ssb_device_id ssb_ehci_table[] = {
201 + SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
202 + SSB_DEVTABLE_END
203 +};
204 +MODULE_DEVICE_TABLE(ssb, ssb_ehci_table);
205 --- a/drivers/usb/host/ohci-ssb.c
206 +++ b/drivers/usb/host/ohci-ssb.c
207 @@ -17,6 +17,8 @@
208 */
209 #include <linux/ssb/ssb.h>
210
211 +extern int ssb_ehci_attach(struct ssb_device *dev, struct usb_hcd **hcd);
212 +extern void ssb_ehci_detach(struct ssb_device *dev, struct usb_hcd *hcd);
213
214 #define SSB_OHCI_TMSLOW_HOSTMODE (1 << 29)
215
216 @@ -24,6 +26,7 @@ struct ssb_ohci_device {
217 struct ohci_hcd ohci; /* _must_ be at the beginning. */
218
219 u32 enable_flags;
220 + struct usb_hcd *ehci_hcd;
221 };
222
223 static inline
224 @@ -92,13 +95,25 @@ static const struct hc_driver ssb_ohci_h
225 static void ssb_ohci_detach(struct ssb_device *dev)
226 {
227 struct usb_hcd *hcd = ssb_get_drvdata(dev);
228 +#ifdef CONFIG_USB_EHCI_HCD_SSB
229 + struct ssb_ohci_device *ohcidev = hcd_to_ssb_ohci(hcd);
230 +#endif
231
232 usb_remove_hcd(hcd);
233 iounmap(hcd->regs);
234 usb_put_hcd(hcd);
235 +
236 +#ifdef CONFIG_USB_EHCI_HCD_SSB
237 + /*
238 + * Also detach ehci function
239 + */
240 + if (dev->id.coreid == SSB_DEV_USB20_HOST)
241 + ssb_ehci_detach(dev, ohcidev->ehci_hcd);
242 +#endif
243 ssb_device_disable(dev, 0);
244 }
245
246 +
247 static int ssb_ohci_attach(struct ssb_device *dev)
248 {
249 struct ssb_ohci_device *ohcidev;
250 @@ -165,6 +180,14 @@ static int ssb_ohci_attach(struct ssb_de
251
252 ssb_set_drvdata(dev, hcd);
253
254 +#ifdef CONFIG_USB_EHCI_HCD_SSB
255 + /*
256 + * attach ehci function in this core
257 + */
258 + if (dev->id.coreid == SSB_DEV_USB20_HOST)
259 + err = ssb_ehci_attach(dev, &(ohcidev->ehci_hcd));
260 +#endif
261 +
262 return err;
263
264 err_iounmap: