diff options
author | Greg Kroah-Hartman | 2017-10-16 10:33:54 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2017-10-16 10:33:54 +0200 |
commit | e4ed2b5370a2df2b1feeb970904d2f7761c241c9 (patch) | |
tree | 852b17dcc8ed1ca8f35771e8f06d660bdfc51804 /drivers/usb/serial/ftdi_sio_ids.h | |
parent | Merge 4.14-rc4 into usb-next (diff) | |
parent | Linux 4.14-rc5 (diff) | |
download | kernel-qcow2-linux-e4ed2b5370a2df2b1feeb970904d2f7761c241c9.tar.gz kernel-qcow2-linux-e4ed2b5370a2df2b1feeb970904d2f7761c241c9.tar.xz kernel-qcow2-linux-e4ed2b5370a2df2b1feeb970904d2f7761c241c9.zip |
Merge 4.14-rc5 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio_ids.h')
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 4fcf1cecb6d7..f9d15bd62785 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h @@ -610,6 +610,13 @@ #define ADI_GNICEPLUS_PID 0xF001 /* + * Cypress WICED USB UART + */ +#define CYPRESS_VID 0x04B4 +#define CYPRESS_WICED_BT_USB_PID 0x009B +#define CYPRESS_WICED_WL_USB_PID 0xF900 + +/* * Microchip Technology, Inc. * * MICROCHIP_VID (0x04D8) and MICROCHIP_USB_BOARD_PID (0x000A) are |