aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb
diff options
context:
space:
mode:
authorAjay Kumar Gupta <ajay.gupta@ti.com>2009-12-28 06:40:41 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 17:53:48 -0500
commit51bf0d0e6cc1f9679a973f61d07cb48e71f9c992 (patch)
treef2d45ef5e2e756cac17e3a312a6a6e0e9a890931 /drivers/usb/musb
parent1c25fda4a09e8229800979986ef399401053b46e (diff)
usb: musb: save dynfifo in musb struct
Save dynamic FIFO read only information for later uses during musb_save/restore_context functions. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/musb')
-rw-r--r--drivers/usb/musb/musb_core.c4
-rw-r--r--drivers/usb/musb/musb_core.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index bd14e816df93..4c8962f976b2 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1341,8 +1341,10 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
1341 reg = musb_read_configdata(mbase); 1341 reg = musb_read_configdata(mbase);
1342 1342
1343 strcpy(aInfo, (reg & MUSB_CONFIGDATA_UTMIDW) ? "UTMI-16" : "UTMI-8"); 1343 strcpy(aInfo, (reg & MUSB_CONFIGDATA_UTMIDW) ? "UTMI-16" : "UTMI-8");
1344 if (reg & MUSB_CONFIGDATA_DYNFIFO) 1344 if (reg & MUSB_CONFIGDATA_DYNFIFO) {
1345 strcat(aInfo, ", dyn FIFOs"); 1345 strcat(aInfo, ", dyn FIFOs");
1346 musb->dyn_fifo = true;
1347 }
1346 if (reg & MUSB_CONFIGDATA_MPRXE) { 1348 if (reg & MUSB_CONFIGDATA_MPRXE) {
1347 strcat(aInfo, ", bulk combine"); 1349 strcat(aInfo, ", bulk combine");
1348 musb->bulk_combine = true; 1350 musb->bulk_combine = true;
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 2ac0e6f7dd9d..eaa01140183e 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -411,6 +411,7 @@ struct musb {
411 411
412 unsigned hb_iso_rx:1; /* high bandwidth iso rx? */ 412 unsigned hb_iso_rx:1; /* high bandwidth iso rx? */
413 unsigned hb_iso_tx:1; /* high bandwidth iso tx? */ 413 unsigned hb_iso_tx:1; /* high bandwidth iso tx? */
414 unsigned dyn_fifo:1; /* dynamic FIFO supported? */
414 415
415 unsigned bulk_split:1; 416 unsigned bulk_split:1;
416#define can_bulk_split(musb,type) \ 417#define can_bulk_split(musb,type) \