diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-24 14:03:12 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-24 14:03:12 +0200 |
commit | 2d5afd51fe6b469e09d8d63fff041cbf4a987278 (patch) | |
tree | 01ab99155c167c6203793e5c604e895d9af10588 /include/linux/usb/renesas_usbhs.h | |
parent | 0520d37bb3d49f8e62e30c80b001e0003b3f3ca9 (diff) | |
parent | ce2b21a4e5ce042c0a42c9db8fa9e0f849427d5e (diff) | |
download | linux-next-2d5afd51fe6b469e09d8d63fff041cbf4a987278.tar.gz |
Merge tag 'usb-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: changes for v4.15 merge window
Not much going on this time around. With only 51 non-merge commits,
this was one of the smallest pull requests from the Gadget tree.
Most of the changes are in the mtu3 driver which added support for
36-bit DMA, support for USB 3.1 and support for dual-role (along with
some non-critical fixes).
The dwc2 driver got a few improvements to how we handle gadget state
tracking and also added support for STM32F7xx devices.
Other than that, we just some minor non-critical fixes and
improvements all over the place.
Diffstat (limited to 'include/linux/usb/renesas_usbhs.h')
-rw-r--r-- | include/linux/usb/renesas_usbhs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h index 00a47d058d83..d2f41e4dd7a8 100644 --- a/include/linux/usb/renesas_usbhs.h +++ b/include/linux/usb/renesas_usbhs.h @@ -183,8 +183,9 @@ struct renesas_usbhs_driver_param { #define USBHS_USB_DMAC_XFER_SIZE 32 /* hardcode the xfer size */ }; -#define USBHS_TYPE_RCAR_GEN2 1 -#define USBHS_TYPE_RCAR_GEN3 2 +#define USBHS_TYPE_RCAR_GEN2 1 +#define USBHS_TYPE_RCAR_GEN3 2 +#define USBHS_TYPE_RCAR_GEN3_WITH_PLL 3 /* * option: |