On Fri, Oct 10, 2014 at 11:52:08AM +0200, Frans Klaver wrote:
> Add new IDs for the Xsens Awinda Station and Awinda Dongle.
>
> While at it, order the definitions by PID and add a logical separation
> between devices using Xsens' VID and those using FTDI's VID.
>
> Cc: <stable@xxxxxxxxxxxxxxx>
> Signed-off-by: Frans Klaver <frans.klaver@xxxxxxxxx>
> ---
> Third time's a charm.
Applied, thanks.
Johan
> drivers/usb/serial/ftdi_sio.c | 2 ++
> drivers/usb/serial/ftdi_sio_ids.h | 6 +++++-
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
> index dc72b92..1f73ca3 100644
> --- a/drivers/usb/serial/ftdi_sio.c
> +++ b/drivers/usb/serial/ftdi_sio.c
> @@ -661,6 +661,8 @@ static const struct usb_device_id id_table_combined[] = {
> { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) },
> { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) },
> { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
> + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },
> + { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },
> { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
> { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
> { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
> diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
> index 5937b2d..b68084c 100644
> --- a/drivers/usb/serial/ftdi_sio_ids.h
> +++ b/drivers/usb/serial/ftdi_sio_ids.h
> @@ -143,8 +143,12 @@
> * Xsens Technologies BV products (http://www.xsens.com).
> */
> #define XSENS_VID 0x2639
> -#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
> +#define XSENS_AWINDA_STATION_PID 0x0101
> +#define XSENS_AWINDA_DONGLE_PID 0x0102
> #define XSENS_MTW_PID 0x0200 /* Xsens MTw */
> +#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
> +
> +/* Xsens devices using FTDI VID */
> #define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
> #define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
> #define XSENS_CONVERTER_2_PID 0xD38A
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html