diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-12 15:51:41 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-12 15:51:45 -0800 |
| commit | a1016ce33ce23296ad030e5276fcfdf9cb27cb6a (patch) | |
| tree | 121cfe8fa100d3459baca5bd5c4cad26783f05aa /drivers/usb/musb/musb_core.c | |
| parent | 007d00d4c11b30b8fd7ff23b9d5aed3743e41f74 (diff) | |
| parent | e7f4e73287d2915499c821b884f70f42187e2a74 (diff) | |
| download | op-kernel-dev-a1016ce33ce23296ad030e5276fcfdf9cb27cb6a.zip op-kernel-dev-a1016ce33ce23296ad030e5276fcfdf9cb27cb6a.tar.gz | |
Merge branch 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
* 'for-next/musb' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
usb: musb: omap2430: fix compile warning
usb: musb: fix pm_runtime calls while atomic
usb: musb: drop ARCH dependency
usb: musb: headers cleanup
usb: musb: allow building USB_MUSB_TUSB6010 as a module
usb: musb: use a Kconfig choice to pick the right DMA method
usb: musb: omap2+: save and restore OTG_INTERFSEL
usb: musb: omap2+: fix context api's
usb: musb: ux500: optimize DMA callback routine
Diffstat (limited to 'drivers/usb/musb/musb_core.c')
| -rw-r--r-- | drivers/usb/musb/musb_core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index 227c1df..de7405e 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -1431,7 +1431,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb) struct musb_hw_ep *hw_ep = musb->endpoints + i; hw_ep->fifo = MUSB_FIFO_OFFSET(i) + mbase; -#ifdef CONFIG_USB_MUSB_TUSB6010 +#if defined(CONFIG_USB_MUSB_TUSB6010) || defined (CONFIG_USB_MUSB_TUSB6010_MODULE) hw_ep->fifo_async = musb->async + 0x400 + MUSB_FIFO_OFFSET(i); hw_ep->fifo_sync = musb->sync + 0x400 + MUSB_FIFO_OFFSET(i); hw_ep->fifo_sync_va = @@ -1630,6 +1630,7 @@ void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit) } } } +EXPORT_SYMBOL_GPL(musb_dma_completion); #else #define use_dma 0 @@ -2157,6 +2158,7 @@ static void musb_save_context(struct musb *musb) if (!epio) continue; + musb_writeb(musb_base, MUSB_INDEX, i); musb->context.index_regs[i].txmaxp = musb_readw(epio, MUSB_TXMAXP); musb->context.index_regs[i].txcsr = @@ -2232,6 +2234,7 @@ static void musb_restore_context(struct musb *musb) if (!epio) continue; + musb_writeb(musb_base, MUSB_INDEX, i); musb_writew(epio, MUSB_TXMAXP, musb->context.index_regs[i].txmaxp); musb_writew(epio, MUSB_TXCSR, |
