Commit 5e0e61af authored by Ajay Kumar Gupta's avatar Ajay Kumar Gupta Committed by Greg Kroah-Hartman

musb: save and restore missing bus control register

Added the missing BUS_CONTROL register in musb
save/restore routines.
Signed-off-by: default avatarAjay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2f831751
...@@ -2176,6 +2176,7 @@ void musb_save_context(struct musb *musb) ...@@ -2176,6 +2176,7 @@ void musb_save_context(struct musb *musb)
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);
musb_context.testmode = musb_readb(musb_base, MUSB_TESTMODE); musb_context.testmode = musb_readb(musb_base, MUSB_TESTMODE);
musb_context.busctl = musb_read_ulpi_buscontrol(musb->mregs);
} }
musb_context.power = musb_readb(musb_base, MUSB_POWER); musb_context.power = musb_readb(musb_base, MUSB_POWER);
musb_context.intrtxe = musb_readw(musb_base, MUSB_INTRTXE); musb_context.intrtxe = musb_readw(musb_base, MUSB_INTRTXE);
...@@ -2247,6 +2248,7 @@ void musb_restore_context(struct musb *musb) ...@@ -2247,6 +2248,7 @@ void musb_restore_context(struct musb *musb)
if (is_host_enabled(musb)) { if (is_host_enabled(musb)) {
musb_writew(musb_base, MUSB_FRAME, musb_context.frame); musb_writew(musb_base, MUSB_FRAME, musb_context.frame);
musb_writeb(musb_base, MUSB_TESTMODE, musb_context.testmode); musb_writeb(musb_base, MUSB_TESTMODE, musb_context.testmode);
musb_write_ulpi_buscontrol(musb->mregs, musb_context.busctl);
} }
musb_writeb(musb_base, MUSB_POWER, musb_context.power); musb_writeb(musb_base, MUSB_POWER, musb_context.power);
musb_writew(musb_base, MUSB_INTRTXE, musb_context.intrtxe); musb_writew(musb_base, MUSB_INTRTXE, musb_context.intrtxe);
......
...@@ -478,7 +478,7 @@ struct musb_context_registers { ...@@ -478,7 +478,7 @@ struct musb_context_registers {
u16 frame; u16 frame;
u8 index, testmode; u8 index, testmode;
u8 devctl, misc; u8 devctl, busctl, misc;
struct musb_csr_regs index_regs[MUSB_C_NUM_EPS]; struct musb_csr_regs index_regs[MUSB_C_NUM_EPS];
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment