diff options
| author | Bryan Wu <bryan.wu@analog.com> | 2010-08-09 14:58:24 -0400 |
|---|---|---|
| committer | Remy Bohmer <linux@bohmer.net> | 2010-10-13 12:08:43 +0200 |
| commit | 4ee691f6aced74c30bbe15d9e97313df21037ae3 (patch) | |
| tree | 7f2fefb3c4f13f8e3115c08262f3c5de9ae7fc8d /drivers | |
| parent | 99e9ed1f49b31cc7c3b8f5d2c322b2eb26dd2a29 (diff) | |
| download | u-boot-imx-4ee691f6aced74c30bbe15d9e97313df21037ae3.zip u-boot-imx-4ee691f6aced74c30bbe15d9e97313df21037ae3.tar.gz u-boot-imx-4ee691f6aced74c30bbe15d9e97313df21037ae3.tar.bz2 | |
usb: musb: only write CLRDATATOG when appropriate
This is a change similar to what is already in the Linux driver. We
should only program the CLRDATATOG bit when the current mode indicates
that it is needed.
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/musb/musb_hcd.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c index af989aa..f38b279 100644 --- a/drivers/usb/musb/musb_hcd.c +++ b/drivers/usb/musb/musb_hcd.c @@ -144,19 +144,28 @@ static void write_toggle(struct usb_device *dev, u8 ep, u8 dir_out) u16 csr; if (dir_out) { - if (!toggle) - writew(MUSB_TXCSR_CLRDATATOG, &musbr->txcsr); - else { - csr = readw(&musbr->txcsr); + csr = readw(&musbr->txcsr); + if (!toggle) { + if (csr & MUSB_TXCSR_MODE) + csr = MUSB_TXCSR_CLRDATATOG; + else + csr = 0; + writew(csr, &musbr->txcsr); + } else { csr |= MUSB_TXCSR_H_WR_DATATOGGLE; writew(csr, &musbr->txcsr); csr |= (toggle << MUSB_TXCSR_H_DATATOGGLE_SHIFT); writew(csr, &musbr->txcsr); } } else { - if (!toggle) - writew(MUSB_RXCSR_CLRDATATOG, &musbr->rxcsr); - else { + if (!toggle) { + csr = readw(&musbr->txcsr); + if (csr & MUSB_TXCSR_MODE) + csr = MUSB_RXCSR_CLRDATATOG; + else + csr = 0; + writew(csr, &musbr->rxcsr); + } else { csr = readw(&musbr->rxcsr); csr |= MUSB_RXCSR_H_WR_DATATOGGLE; writew(csr, &musbr->rxcsr); |