diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/usb/c67x00 | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'drivers/usb/c67x00')
-rw-r--r-- | drivers/usb/c67x00/c67x00-drv.c | 22 | ||||
-rw-r--r-- | drivers/usb/c67x00/c67x00-hcd.c | 1 |
2 files changed, 17 insertions, 6 deletions
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c index fe815ecd557..62050f7a4f9 100644 --- a/drivers/usb/c67x00/c67x00-drv.c +++ b/drivers/usb/c67x00/c67x00-drv.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <linux/io.h> | 38 | #include <linux/io.h> |
39 | #include <linux/list.h> | 39 | #include <linux/list.h> |
40 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
41 | #include <linux/module.h> | ||
42 | #include <linux/usb.h> | 41 | #include <linux/usb.h> |
43 | #include <linux/usb/c67x00.h> | 42 | #include <linux/usb/c67x00.h> |
44 | 43 | ||
@@ -116,7 +115,7 @@ static irqreturn_t c67x00_irq(int irq, void *__dev) | |||
116 | 115 | ||
117 | /* ------------------------------------------------------------------------- */ | 116 | /* ------------------------------------------------------------------------- */ |
118 | 117 | ||
119 | static int c67x00_drv_probe(struct platform_device *pdev) | 118 | static int __devinit c67x00_drv_probe(struct platform_device *pdev) |
120 | { | 119 | { |
121 | struct c67x00_device *c67x00; | 120 | struct c67x00_device *c67x00; |
122 | struct c67x00_platform_data *pdata; | 121 | struct c67x00_platform_data *pdata; |
@@ -191,7 +190,7 @@ static int c67x00_drv_probe(struct platform_device *pdev) | |||
191 | return ret; | 190 | return ret; |
192 | } | 191 | } |
193 | 192 | ||
194 | static int c67x00_drv_remove(struct platform_device *pdev) | 193 | static int __devexit c67x00_drv_remove(struct platform_device *pdev) |
195 | { | 194 | { |
196 | struct c67x00_device *c67x00 = platform_get_drvdata(pdev); | 195 | struct c67x00_device *c67x00 = platform_get_drvdata(pdev); |
197 | struct resource *res; | 196 | struct resource *res; |
@@ -219,16 +218,27 @@ static int c67x00_drv_remove(struct platform_device *pdev) | |||
219 | 218 | ||
220 | static struct platform_driver c67x00_driver = { | 219 | static struct platform_driver c67x00_driver = { |
221 | .probe = c67x00_drv_probe, | 220 | .probe = c67x00_drv_probe, |
222 | .remove = c67x00_drv_remove, | 221 | .remove = __devexit_p(c67x00_drv_remove), |
223 | .driver = { | 222 | .driver = { |
224 | .owner = THIS_MODULE, | 223 | .owner = THIS_MODULE, |
225 | .name = "c67x00", | 224 | .name = "c67x00", |
226 | }, | 225 | }, |
227 | }; | 226 | }; |
227 | MODULE_ALIAS("platform:c67x00"); | ||
228 | |||
229 | static int __init c67x00_init(void) | ||
230 | { | ||
231 | return platform_driver_register(&c67x00_driver); | ||
232 | } | ||
228 | 233 | ||
229 | module_platform_driver(c67x00_driver); | 234 | static void __exit c67x00_exit(void) |
235 | { | ||
236 | platform_driver_unregister(&c67x00_driver); | ||
237 | } | ||
238 | |||
239 | module_init(c67x00_init); | ||
240 | module_exit(c67x00_exit); | ||
230 | 241 | ||
231 | MODULE_AUTHOR("Peter Korsgaard, Jan Veldeman, Grant Likely"); | 242 | MODULE_AUTHOR("Peter Korsgaard, Jan Veldeman, Grant Likely"); |
232 | MODULE_DESCRIPTION("Cypress C67X00 USB Controller Driver"); | 243 | MODULE_DESCRIPTION("Cypress C67X00 USB Controller Driver"); |
233 | MODULE_LICENSE("GPL"); | 244 | MODULE_LICENSE("GPL"); |
234 | MODULE_ALIAS("platform:c67x00"); | ||
diff --git a/drivers/usb/c67x00/c67x00-hcd.c b/drivers/usb/c67x00/c67x00-hcd.c index 75e47b860a5..d3e1356d091 100644 --- a/drivers/usb/c67x00/c67x00-hcd.c +++ b/drivers/usb/c67x00/c67x00-hcd.c | |||
@@ -271,6 +271,7 @@ static void c67x00_hcd_irq(struct c67x00_sie *sie, u16 int_status, u16 msg) | |||
271 | if (int_status & SOFEOP_FLG(sie->sie_num)) { | 271 | if (int_status & SOFEOP_FLG(sie->sie_num)) { |
272 | c67x00_ll_usb_clear_status(sie, SOF_EOP_IRQ_FLG); | 272 | c67x00_ll_usb_clear_status(sie, SOF_EOP_IRQ_FLG); |
273 | c67x00_sched_kick(c67x00); | 273 | c67x00_sched_kick(c67x00); |
274 | set_bit(HCD_FLAG_SAW_IRQ, &hcd->flags); | ||
274 | } | 275 | } |
275 | } | 276 | } |
276 | 277 | ||