diff options
| author | Peter Griffin | 2016-05-11 18:33:11 +0200 |
|---|---|---|
| committer | Felipe Balbi | 2016-05-31 10:24:31 +0200 |
| commit | 27a0faafdca53bda21ed340ca8f8960696dda049 (patch) | |
| tree | 30ae3b3d53aa79be4c85aa12978d1c2484c4c981 /drivers/usb/dwc3/dwc3-st.c | |
| parent | usb: gadget: composite: don't queue OS desc req if length is invalid (diff) | |
| download | kernel-qcow2-linux-27a0faafdca53bda21ed340ca8f8960696dda049.tar.gz kernel-qcow2-linux-27a0faafdca53bda21ed340ca8f8960696dda049.tar.xz kernel-qcow2-linux-27a0faafdca53bda21ed340ca8f8960696dda049.zip | |
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.
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Diffstat (limited to 'drivers/usb/dwc3/dwc3-st.c')
| -rw-r--r-- | drivers/usb/dwc3/dwc3-st.c | 10 |
1 files changed, 8 insertions, 2 deletions
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: |