korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 16:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb: musb: Change to direct addr in context save/restore

Browse Source 
Since not all platforms are using the same offset 0x10 in
musb_save/restore_context() eg Blackfin the offset is 0x40,
Change the indexed address to direct.

Signed-off-by: Bob Liu <lliubbo@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bob Liu 2010-09-24 13:44:07 +03:00 committed by Greg Kroah-Hartman
parent 496dda704b
commit ae9b2ad2ee
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/usb/musb/musb_core.c
View File

@ -2266,6 +2266,7 @@ void musb_save_context(struct musb *musb)
{ {
int i; int i;
void __iomem *musb_base = musb->mregs; void __iomem *musb_base = musb->mregs;
void __iomem *epio;
if (is_host_enabled(musb)) { if (is_host_enabled(musb)) {
musb_context.frame = musb_readw(musb_base, MUSB_FRAME); musb_context.frame = musb_readw(musb_base, MUSB_FRAME);
@ -2279,16 +2280,16 @@ void musb_save_context(struct musb *musb)
musb_context.index = musb_readb(musb_base, MUSB_INDEX); musb_context.index = musb_readb(musb_base, MUSB_INDEX);
musb_context.devctl = musb_readb(musb_base, MUSB_DEVCTL); musb_context.devctl = musb_readb(musb_base, MUSB_DEVCTL);
for (i = 0; i < MUSB_C_NUM_EPS; ++i) { for (i = 0; i < musb->config->num_eps; ++i) {
musb_writeb(musb_base, MUSB_INDEX, i); epio = musb->endpoints[i].regs;
musb_context.index_regs[i].txmaxp = musb_context.index_regs[i].txmaxp =
musb_readw(musb_base, 0x10 + MUSB_TXMAXP); musb_readw(epio, MUSB_TXMAXP);
musb_context.index_regs[i].txcsr = musb_context.index_regs[i].txcsr =
musb_readw(musb_base, 0x10 + MUSB_TXCSR); musb_readw(epio, MUSB_TXCSR);
musb_context.index_regs[i].rxmaxp = musb_context.index_regs[i].rxmaxp =
musb_readw(musb_base, 0x10 + MUSB_RXMAXP); musb_readw(epio, MUSB_RXMAXP);
musb_context.index_regs[i].rxcsr = musb_context.index_regs[i].rxcsr =
musb_readw(musb_base, 0x10 + MUSB_RXCSR); musb_readw(epio, MUSB_RXCSR);
if (musb->dyn_fifo) { if (musb->dyn_fifo) {
musb_context.index_regs[i].txfifoadd = musb_context.index_regs[i].txfifoadd =
@ -2302,13 +2303,13 @@ void musb_save_context(struct musb *musb)
} }
if (is_host_enabled(musb)) { if (is_host_enabled(musb)) {
musb_context.index_regs[i].txtype = musb_context.index_regs[i].txtype =
musb_readb(musb_base, 0x10 + MUSB_TXTYPE); musb_readb(epio, MUSB_TXTYPE);
musb_context.index_regs[i].txinterval = musb_context.index_regs[i].txinterval =
musb_readb(musb_base, 0x10 + MUSB_TXINTERVAL); musb_readb(epio, MUSB_TXINTERVAL);
musb_context.index_regs[i].rxtype = musb_context.index_regs[i].rxtype =
musb_readb(musb_base, 0x10 + MUSB_RXTYPE); musb_readb(epio, MUSB_RXTYPE);
musb_context.index_regs[i].rxinterval = musb_context.index_regs[i].rxinterval =
musb_readb(musb_base, 0x10 + MUSB_RXINTERVAL); musb_readb(epio, MUSB_RXINTERVAL);
musb_context.index_regs[i].txfunaddr = musb_context.index_regs[i].txfunaddr =
musb_read_txfunaddr(musb_base, i); musb_read_txfunaddr(musb_base, i);
@ -2326,8 +2327,6 @@ void musb_save_context(struct musb *musb)
} }
} }
musb_writeb(musb_base, MUSB_INDEX, musb_context.index);
musb_platform_save_context(musb, &musb_context); musb_platform_save_context(musb, &musb_context);
} }
@ -2336,6 +2335,7 @@ void musb_restore_context(struct musb *musb)
int i; int i;
void __iomem *musb_base = musb->mregs; void __iomem *musb_base = musb->mregs;
void __iomem *ep_target_regs; void __iomem *ep_target_regs;
void __iomem *epio;
musb_platform_restore_context(musb, &musb_context); musb_platform_restore_context(musb, &musb_context);
@ -2350,15 +2350,15 @@ void musb_restore_context(struct musb *musb)
musb_writeb(musb_base, MUSB_INTRUSBE, musb_context.intrusbe); musb_writeb(musb_base, MUSB_INTRUSBE, musb_context.intrusbe);
musb_writeb(musb_base, MUSB_DEVCTL, musb_context.devctl); musb_writeb(musb_base, MUSB_DEVCTL, musb_context.devctl);
for (i = 0; i < MUSB_C_NUM_EPS; ++i) { for (i = 0; i < musb->config->num_eps; ++i) {
musb_writeb(musb_base, MUSB_INDEX, i); epio = musb->endpoints[i].regs;
musb_writew(musb_base, 0x10 + MUSB_TXMAXP, musb_writew(epio, MUSB_TXMAXP,
musb_context.index_regs[i].txmaxp); musb_context.index_regs[i].txmaxp);
musb_writew(musb_base, 0x10 + MUSB_TXCSR, musb_writew(epio, MUSB_TXCSR,
musb_context.index_regs[i].txcsr); musb_context.index_regs[i].txcsr);
musb_writew(musb_base, 0x10 + MUSB_RXMAXP, musb_writew(epio, MUSB_RXMAXP,
musb_context.index_regs[i].rxmaxp); musb_context.index_regs[i].rxmaxp);
musb_writew(musb_base, 0x10 + MUSB_RXCSR, musb_writew(epio, MUSB_RXCSR,
musb_context.index_regs[i].rxcsr); musb_context.index_regs[i].rxcsr);
if (musb->dyn_fifo) { if (musb->dyn_fifo) {
@ -2373,13 +2373,13 @@ void musb_restore_context(struct musb *musb)
} }
if (is_host_enabled(musb)) { if (is_host_enabled(musb)) {
musb_writeb(musb_base, 0x10 + MUSB_TXTYPE, musb_writeb(epio, MUSB_TXTYPE,
musb_context.index_regs[i].txtype); musb_context.index_regs[i].txtype);
musb_writeb(musb_base, 0x10 + MUSB_TXINTERVAL, musb_writeb(epio, MUSB_TXINTERVAL,
musb_context.index_regs[i].txinterval); musb_context.index_regs[i].txinterval);
musb_writeb(musb_base, 0x10 + MUSB_RXTYPE, musb_writeb(epio, MUSB_RXTYPE,
musb_context.index_regs[i].rxtype); musb_context.index_regs[i].rxtype);
musb_writeb(musb_base, 0x10 + MUSB_RXINTERVAL, musb_writeb(epio, MUSB_RXINTERVAL,
musb_context.index_regs[i].rxinterval); musb_context.index_regs[i].rxinterval);
musb_write_txfunaddr(musb_base, i, musb_write_txfunaddr(musb_base, i,
@ -2400,8 +2400,6 @@ void musb_restore_context(struct musb *musb)
musb_context.index_regs[i].rxhubport); musb_context.index_regs[i].rxhubport);
} }
} }
musb_writeb(musb_base, MUSB_INDEX, musb_context.index);
} }
static int musb_suspend(struct device *dev) static int musb_suspend(struct device *dev)