summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamon Fried <ramon.fried@gmail.com>2018-09-21 13:35:56 +0300
committerTom Rini <trini@konsulko.com>2018-09-30 13:00:37 -0400
commit30b3241368aff899c56359f63214c164ed3fb3fb (patch)
tree5b20f606eaad0dfa53e6583d089a1071c951e94b
parentaa043ee91a4781f8c7e08d8380a9c41dc22fd32a (diff)
downloadu-boot-30b3241368aff899c56359f63214c164ed3fb3fb.tar.gz
usb:ci_udc: don't overwrite configuration on pullup
change writel to writebits32 in ci_pullup() in order to keep phy configuration in tact. Signed-off-by: Ramon Fried <ramon.fried@gmail.com>
-rw-r--r--drivers/usb/gadget/ci_udc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index 8d23fab3b7..0a84f6850d 100644
--- a/drivers/usb/gadget/ci_udc.c
+++ b/drivers/usb/gadget/ci_udc.c
@@ -906,7 +906,8 @@ static int ci_pullup(struct usb_gadget *gadget, int is_on)
writel(0xffffffff, &udc->epflush);
/* Turn on the USB connection by enabling the pullup resistor */
- writel(USBCMD_ITC(MICRO_8FRAME) | USBCMD_RUN, &udc->usbcmd);
+ setbits_le32(&udc->usbcmd, USBCMD_ITC(MICRO_8FRAME) |
+ USBCMD_RUN);
} else {
udc_disconnect();
}