diff options
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 5 | ||||
-rw-r--r-- | drivers/usb/host/ohci-lh7a404.c | 252 | ||||
-rw-r--r-- | drivers/usb/host/ohci.h | 10 |
3 files changed, 0 insertions, 267 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index f4062bba9d04..e7288639edb0 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -1014,11 +1014,6 @@ MODULE_LICENSE ("GPL"); | |||
1014 | #define OMAP3_PLATFORM_DRIVER ohci_hcd_omap3_driver | 1014 | #define OMAP3_PLATFORM_DRIVER ohci_hcd_omap3_driver |
1015 | #endif | 1015 | #endif |
1016 | 1016 | ||
1017 | #ifdef CONFIG_ARCH_LH7A404 | ||
1018 | #include "ohci-lh7a404.c" | ||
1019 | #define PLATFORM_DRIVER ohci_hcd_lh7a404_driver | ||
1020 | #endif | ||
1021 | |||
1022 | #if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) | 1017 | #if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) |
1023 | #include "ohci-pxa27x.c" | 1018 | #include "ohci-pxa27x.c" |
1024 | #define PLATFORM_DRIVER ohci_hcd_pxa27x_driver | 1019 | #define PLATFORM_DRIVER ohci_hcd_pxa27x_driver |
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c deleted file mode 100644 index 18d39f0463ee..000000000000 --- a/drivers/usb/host/ohci-lh7a404.c +++ /dev/null | |||
@@ -1,252 +0,0 @@ | |||
1 | /* | ||
2 | * OHCI HCD (Host Controller Driver) for USB. | ||
3 | * | ||
4 | * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at> | ||
5 | * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net> | ||
6 | * (C) Copyright 2002 Hewlett-Packard Company | ||
7 | * | ||
8 | * Bus Glue for Sharp LH7A404 | ||
9 | * | ||
10 | * Written by Christopher Hoover <ch@hpl.hp.com> | ||
11 | * Based on fragments of previous driver by Russell King et al. | ||
12 | * | ||
13 | * Modified for LH7A404 from ohci-sa1111.c | ||
14 | * by Durgesh Pattamatta <pattamattad@sharpsec.com> | ||
15 | * | ||
16 | * This file is licenced under the GPL. | ||
17 | */ | ||
18 | |||
19 | #include <linux/platform_device.h> | ||
20 | #include <linux/signal.h> | ||
21 | |||
22 | #include <mach/hardware.h> | ||
23 | |||
24 | |||
25 | extern int usb_disabled(void); | ||
26 | |||
27 | /*-------------------------------------------------------------------------*/ | ||
28 | |||
29 | static void lh7a404_start_hc(struct platform_device *dev) | ||
30 | { | ||
31 | printk(KERN_DEBUG "%s: starting LH7A404 OHCI USB Controller\n", | ||
32 | __FILE__); | ||
33 | |||
34 | /* | ||
35 | * Now, carefully enable the USB clock, and take | ||
36 | * the USB host controller out of reset. | ||
37 | */ | ||
38 | CSC_PWRCNT |= CSC_PWRCNT_USBH_EN; /* Enable clock */ | ||
39 | udelay(1000); | ||
40 | USBH_CMDSTATUS = OHCI_HCR; | ||
41 | |||
42 | printk(KERN_DEBUG "%s: Clock to USB host has been enabled \n", __FILE__); | ||
43 | } | ||
44 | |||
45 | static void lh7a404_stop_hc(struct platform_device *dev) | ||
46 | { | ||
47 | printk(KERN_DEBUG "%s: stopping LH7A404 OHCI USB Controller\n", | ||
48 | __FILE__); | ||
49 | |||
50 | CSC_PWRCNT &= ~CSC_PWRCNT_USBH_EN; /* Disable clock */ | ||
51 | } | ||
52 | |||
53 | |||
54 | /*-------------------------------------------------------------------------*/ | ||
55 | |||
56 | /* configure so an HC device and id are always provided */ | ||
57 | /* always called with process context; sleeping is OK */ | ||
58 | |||
59 | |||
60 | /** | ||
61 | * usb_hcd_lh7a404_probe - initialize LH7A404-based HCDs | ||
62 | * Context: !in_interrupt() | ||
63 | * | ||
64 | * Allocates basic resources for this USB host controller, and | ||
65 | * then invokes the start() method for the HCD associated with it | ||
66 | * through the hotplug entry's driver_data. | ||
67 | * | ||
68 | */ | ||
69 | int usb_hcd_lh7a404_probe (const struct hc_driver *driver, | ||
70 | struct platform_device *dev) | ||
71 | { | ||
72 | int retval; | ||
73 | struct usb_hcd *hcd; | ||
74 | |||
75 | if (dev->resource[1].flags != IORESOURCE_IRQ) { | ||
76 | pr_debug("resource[1] is not IORESOURCE_IRQ"); | ||
77 | return -ENOMEM; | ||
78 | } | ||
79 | |||
80 | hcd = usb_create_hcd(driver, &dev->dev, "lh7a404"); | ||
81 | if (!hcd) | ||
82 | return -ENOMEM; | ||
83 | hcd->rsrc_start = dev->resource[0].start; | ||
84 | hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1; | ||
85 | |||
86 | if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { | ||
87 | pr_debug("request_mem_region failed"); | ||
88 | retval = -EBUSY; | ||
89 | goto err1; | ||
90 | } | ||
91 | |||
92 | hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); | ||
93 | if (!hcd->regs) { | ||
94 | pr_debug("ioremap failed"); | ||
95 | retval = -ENOMEM; | ||
96 | goto err2; | ||
97 | } | ||
98 | |||
99 | lh7a404_start_hc(dev); | ||
100 | ohci_hcd_init(hcd_to_ohci(hcd)); | ||
101 | |||
102 | retval = usb_add_hcd(hcd, dev->resource[1].start, IRQF_DISABLED); | ||
103 | if (retval == 0) | ||
104 | return retval; | ||
105 | |||
106 | lh7a404_stop_hc(dev); | ||
107 | iounmap(hcd->regs); | ||
108 | err2: | ||
109 | release_mem_region(hcd->rsrc_start, hcd->rsrc_len); | ||
110 | err1: | ||
111 | usb_put_hcd(hcd); | ||
112 | return retval; | ||
113 | } | ||
114 | |||
115 | |||
116 | /* may be called without controller electrically present */ | ||
117 | /* may be called with controller, bus, and devices active */ | ||
118 | |||
119 | /** | ||
120 | * usb_hcd_lh7a404_remove - shutdown processing for LH7A404-based HCDs | ||
121 | * @dev: USB Host Controller being removed | ||
122 | * Context: !in_interrupt() | ||
123 | * | ||
124 | * Reverses the effect of usb_hcd_lh7a404_probe(), first invoking | ||
125 | * the HCD's stop() method. It is always called from a thread | ||
126 | * context, normally "rmmod", "apmd", or something similar. | ||
127 | * | ||
128 | */ | ||
129 | void usb_hcd_lh7a404_remove (struct usb_hcd *hcd, struct platform_device *dev) | ||
130 | { | ||
131 | usb_remove_hcd(hcd); | ||
132 | lh7a404_stop_hc(dev); | ||
133 | iounmap(hcd->regs); | ||
134 | release_mem_region(hcd->rsrc_start, hcd->rsrc_len); | ||
135 | usb_put_hcd(hcd); | ||
136 | } | ||
137 | |||
138 | /*-------------------------------------------------------------------------*/ | ||
139 | |||
140 | static int __devinit | ||
141 | ohci_lh7a404_start (struct usb_hcd *hcd) | ||
142 | { | ||
143 | struct ohci_hcd *ohci = hcd_to_ohci (hcd); | ||
144 | int ret; | ||
145 | |||
146 | ohci_dbg (ohci, "ohci_lh7a404_start, ohci:%p", ohci); | ||
147 | if ((ret = ohci_init(ohci)) < 0) | ||
148 | return ret; | ||
149 | |||
150 | if ((ret = ohci_run (ohci)) < 0) { | ||
151 | err ("can't start %s", hcd->self.bus_name); | ||
152 | ohci_stop (hcd); | ||
153 | return ret; | ||
154 | } | ||
155 | return 0; | ||
156 | } | ||
157 | |||
158 | /*-------------------------------------------------------------------------*/ | ||
159 | |||
160 | static const struct hc_driver ohci_lh7a404_hc_driver = { | ||
161 | .description = hcd_name, | ||
162 | .product_desc = "LH7A404 OHCI", | ||
163 | .hcd_priv_size = sizeof(struct ohci_hcd), | ||
164 | |||
165 | /* | ||
166 | * generic hardware linkage | ||
167 | */ | ||
168 | .irq = ohci_irq, | ||
169 | .flags = HCD_USB11 | HCD_MEMORY, | ||
170 | |||
171 | /* | ||
172 | * basic lifecycle operations | ||
173 | */ | ||
174 | .start = ohci_lh7a404_start, | ||
175 | .stop = ohci_stop, | ||
176 | .shutdown = ohci_shutdown, | ||
177 | |||
178 | /* | ||
179 | * managing i/o requests and associated device resources | ||
180 | */ | ||
181 | .urb_enqueue = ohci_urb_enqueue, | ||
182 | .urb_dequeue = ohci_urb_dequeue, | ||
183 | .endpoint_disable = ohci_endpoint_disable, | ||
184 | |||
185 | /* | ||
186 | * scheduling support | ||
187 | */ | ||
188 | .get_frame_number = ohci_get_frame, | ||
189 | |||
190 | /* | ||
191 | * root hub support | ||
192 | */ | ||
193 | .hub_status_data = ohci_hub_status_data, | ||
194 | .hub_control = ohci_hub_control, | ||
195 | #ifdef CONFIG_PM | ||
196 | .bus_suspend = ohci_bus_suspend, | ||
197 | .bus_resume = ohci_bus_resume, | ||
198 | #endif | ||
199 | .start_port_reset = ohci_start_port_reset, | ||
200 | }; | ||
201 | |||
202 | /*-------------------------------------------------------------------------*/ | ||
203 | |||
204 | static int ohci_hcd_lh7a404_drv_probe(struct platform_device *pdev) | ||
205 | { | ||
206 | int ret; | ||
207 | |||
208 | pr_debug ("In ohci_hcd_lh7a404_drv_probe"); | ||
209 | |||
210 | if (usb_disabled()) | ||
211 | return -ENODEV; | ||
212 | |||
213 | ret = usb_hcd_lh7a404_probe(&ohci_lh7a404_hc_driver, pdev); | ||
214 | return ret; | ||
215 | } | ||
216 | |||
217 | static int ohci_hcd_lh7a404_drv_remove(struct platform_device *pdev) | ||
218 | { | ||
219 | struct usb_hcd *hcd = platform_get_drvdata(pdev); | ||
220 | |||
221 | usb_hcd_lh7a404_remove(hcd, pdev); | ||
222 | return 0; | ||
223 | } | ||
224 | /*TBD*/ | ||
225 | /*static int ohci_hcd_lh7a404_drv_suspend(struct platform_device *dev) | ||
226 | { | ||
227 | struct usb_hcd *hcd = platform_get_drvdata(dev); | ||
228 | |||
229 | return 0; | ||
230 | } | ||
231 | static int ohci_hcd_lh7a404_drv_resume(struct platform_device *dev) | ||
232 | { | ||
233 | struct usb_hcd *hcd = platform_get_drvdata(dev); | ||
234 | |||
235 | |||
236 | return 0; | ||
237 | } | ||
238 | */ | ||
239 | |||
240 | static struct platform_driver ohci_hcd_lh7a404_driver = { | ||
241 | .probe = ohci_hcd_lh7a404_drv_probe, | ||
242 | .remove = ohci_hcd_lh7a404_drv_remove, | ||
243 | .shutdown = usb_hcd_platform_shutdown, | ||
244 | /*.suspend = ohci_hcd_lh7a404_drv_suspend, */ | ||
245 | /*.resume = ohci_hcd_lh7a404_drv_resume, */ | ||
246 | .driver = { | ||
247 | .name = "lh7a404-ohci", | ||
248 | .owner = THIS_MODULE, | ||
249 | }, | ||
250 | }; | ||
251 | |||
252 | MODULE_ALIAS("platform:lh7a404-ohci"); | ||
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index bad11a72c202..35e5fd640ce7 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h | |||
@@ -575,18 +575,8 @@ static inline void _ohci_writel (const struct ohci_hcd *ohci, | |||
575 | #endif | 575 | #endif |
576 | } | 576 | } |
577 | 577 | ||
578 | #ifdef CONFIG_ARCH_LH7A404 | ||
579 | /* Marc Singer: at the time this code was written, the LH7A404 | ||
580 | * had a problem reading the USB host registers. This | ||
581 | * implementation of the ohci_readl function performs the read | ||
582 | * twice as a work-around. | ||
583 | */ | ||
584 | #define ohci_readl(o,r) (_ohci_readl(o,r),_ohci_readl(o,r)) | ||
585 | #define ohci_writel(o,v,r) _ohci_writel(o,v,r) | ||
586 | #else | ||
587 | #define ohci_readl(o,r) _ohci_readl(o,r) | 578 | #define ohci_readl(o,r) _ohci_readl(o,r) |
588 | #define ohci_writel(o,v,r) _ohci_writel(o,v,r) | 579 | #define ohci_writel(o,v,r) _ohci_writel(o,v,r) |
589 | #endif | ||
590 | 580 | ||
591 | 581 | ||
592 | /*-------------------------------------------------------------------------*/ | 582 | /*-------------------------------------------------------------------------*/ |