From: Ramon Fried <ramon.fried@gmail.com>
Date: Fri, 21 Sep 2018 10:35:56 +0000 (+0300)
Subject: usb:ci_udc: don't overwrite configuration on pullup
X-Git-Tag: v2018.11-rc1~5
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fu-boot.git;a=commitdiff_plain;h=30b3241368aff899c56359f63214c164ed3fb3fb

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>
---

diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c
index 8d23fab3b79..0a84f6850d1 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();
 	}