diff options
| author | Greg Kroah-Hartman | 2018-09-16 22:44:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-09-16 22:44:14 +0200 |
| commit | 1652a83fa494b12e20fc02a2cc3ddbcd75d53170 (patch) | |
| tree | 2aa6461f309916dfadb19ed9e30886f4ece11e39 /drivers/usb/mtu3/mtu3_core.c | |
| parent | usb: core: remove flags variable in __usb_hcd_giveback_urb() (diff) | |
| parent | Linux 4.19-rc4 (diff) | |
| download | kernel-qcow2-linux-1652a83fa494b12e20fc02a2cc3ddbcd75d53170.tar.gz kernel-qcow2-linux-1652a83fa494b12e20fc02a2cc3ddbcd75d53170.tar.xz kernel-qcow2-linux-1652a83fa494b12e20fc02a2cc3ddbcd75d53170.zip | |
Merge 4.19-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/mtu3/mtu3_core.c')
| -rw-r--r-- | drivers/usb/mtu3/mtu3_core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c index 2ec1da641a19..ae70b9bfd797 100644 --- a/drivers/usb/mtu3/mtu3_core.c +++ b/drivers/usb/mtu3/mtu3_core.c @@ -107,8 +107,12 @@ static int mtu3_device_enable(struct mtu3 *mtu) (SSUSB_U2_PORT_DIS | SSUSB_U2_PORT_PDN | SSUSB_U2_PORT_HOST_SEL)); - if (mtu->ssusb->dr_mode == USB_DR_MODE_OTG) + if (mtu->ssusb->dr_mode == USB_DR_MODE_OTG) { mtu3_setbits(ibase, SSUSB_U2_CTRL(0), SSUSB_U2_PORT_OTG_SEL); + if (mtu->is_u3_ip) + mtu3_setbits(ibase, SSUSB_U3_CTRL(0), + SSUSB_U3_PORT_DUAL_MODE); + } return ssusb_check_clocks(mtu->ssusb, check_clk); } |