From: Peter Griffin Date: Wed, 11 May 2016 16:33:11 +0000 (+0100) Subject: UPSTREAM: usb: dwc3: st: Fix USB_DR_MODE_PERIPHERAL configuration. X-Git-Tag: firefly_0821_release~1842 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=657382feecd9b8deb7af35968f76fc1a756b3924;p=firefly-linux-kernel-4.4.55.git UPSTREAM: usb: dwc3: st: Fix USB_DR_MODE_PERIPHERAL configuration. Set USB3_FORCE_VBUSVALID when configured for USB_DR_MODE_PERIPHERAL mode, as it is required to have a working setup. This worked on the internal driver by relying on the reset value of the syscfg register as the bits aren't explicity cleared and set like the upstream driver. Also add a comment about what setting this bit means. Change-Id: Ibd3a18b3a85b53dcf8471a1231b502185641c010 Signed-off-by: Peter Griffin Signed-off-by: Felipe Balbi Signed-off-by: Wu Liang feng (cherry picked from commit 27a0faafdca53bda21ed340ca8f8960696dda049) --- diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c index 5c0adb9c6fb2..50d6ae6f88bc 100644 --- a/drivers/usb/dwc3/dwc3-st.c +++ b/drivers/usb/dwc3/dwc3-st.c @@ -129,12 +129,18 @@ static int st_dwc3_drd_init(struct st_dwc3 *dwc3_data) switch (dwc3_data->dr_mode) { case USB_DR_MODE_PERIPHERAL: - val &= ~(USB3_FORCE_VBUSVALID | USB3_DELAY_VBUSVALID + val &= ~(USB3_DELAY_VBUSVALID | USB3_SEL_FORCE_OPMODE | USB3_FORCE_OPMODE(0x3) | USB3_SEL_FORCE_DPPULLDOWN2 | USB3_FORCE_DPPULLDOWN2 | USB3_SEL_FORCE_DMPULLDOWN2 | USB3_FORCE_DMPULLDOWN2); - val |= USB3_DEVICE_NOT_HOST; + /* + * USB3_PORT2_FORCE_VBUSVALID When '1' and when + * USB3_PORT2_DEVICE_NOT_HOST = 1, forces VBUSVLDEXT2 input + * of the pico PHY to 1. + */ + + val |= USB3_DEVICE_NOT_HOST | USB3_FORCE_VBUSVALID; break; case USB_DR_MODE_HOST: