On Fri, Sep 08, 2017 at 09:08:58PM +0000, Sheng-Hui J. Chu wrote:
> From: Jeffrey Chu <jeffrey.chu@xxxxxxxxxxx>
>
> Add CYPRESS_VID vid and CYPRESS_WICED_BT_USB and CYPRESS_WICED_WL_USB
> device IDs to ftdi_sio driver
>
> Signed-off-by: Jeffrey Chu <jeffrey.chu@xxxxxxxxxxx>
I have two v9 of this patch in my mailbox with different authorship and
sent five minutes apart. I figured you really wanted this last one
applied, but next time make sure to increase the patch revision (e.g.
mark it as v10) to avoid any confusion.
> ---
> drivers/usb/serial/ftdi_sio.c | 2 ++
> drivers/usb/serial/ftdi_sio_ids.h | 7 +++++++
> 2 files changed, 9 insertions(+)
>
> diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> index 1cec037..49d1b2d 100644
> --- a/drivers/usb/serial/ftdi_sio.c
> +++ b/drivers/usb/serial/ftdi_sio.c
> @@ -1015,6 +1015,8 @@ static const struct usb_device_id id_table_combined[] = {
> { USB_DEVICE(WICED_VID, WICED_USB20706V2_PID) },
> { USB_DEVICE(TI_VID, TI_CC3200_LAUNCHPAD_PID),
> .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
> + { USB_DEVICE(CYPRESS_VID, CYPRESS_WICED_BT_USB_PID) },
> + { USB_DEVICE(CYPRESS_VID, CYPRESS_WICED_WL_USB_PID) },
> { } /* Terminating entry */
> };
>
> diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
> index 4fcf1ce..d58dc1b 100644
> --- a/drivers/usb/serial/ftdi_sio_ids.h
> +++ b/drivers/usb/serial/ftdi_sio_ids.h
> @@ -692,6 +692,13 @@
> #define WICED_USB20706V2_PID 0x6422
>
> /*
> + * Cypress WICED USB UART
> + */
> +#define CYPRESS_VID 0x04B4
> +#define CYPRESS_WICED_BT_USB_PID 0x009B
> +#define CYPRESS_WICED_WL_USB_PID 0xF900
> +
> +/*
> * Definitions for ID TECH (www.idt-net.com) devices
> */
> #define IDTECH_VID 0x0ACD /* ID TECH Vendor ID */
I've applied this one now with some minor tweaks (e.g. kept the define
sections sorted by VID, and adjusted the commit message slightly).
Thanks,
Johan
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
