diff options
| author | Frans Klaver <frans.klaver@xsens.com> | 2014-10-10 05:52:08 -0400 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2014-10-22 04:04:35 -0400 |
| commit | edd74ffab1f6909eee400c7de8ce621870aacac9 (patch) | |
| tree | 52132fc4457fe54fb0ec742d6cfc728aa8780dbd /drivers/usb/serial | |
| parent | 35cc83eab097e5720a9cc0ec12bdc3a726f58381 (diff) | |
usb: serial: ftdi_sio: add Awinda Station and Dongle products
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@vger.kernel.org>
Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index dc72b924c399..1f73ca3f6904 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[] = { | |||
| 661 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) }, | 661 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) }, |
| 662 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) }, | 662 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) }, |
| 663 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) }, | 663 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) }, |
| 664 | { USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) }, | ||
| 665 | { USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) }, | ||
| 664 | { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) }, | 666 | { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) }, |
| 665 | { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) }, | 667 | { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) }, |
| 666 | { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) }, | 668 | { 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 5937b2d242f2..b68084c11432 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
| @@ -143,8 +143,12 @@ | |||
| 143 | * Xsens Technologies BV products (http://www.xsens.com). | 143 | * Xsens Technologies BV products (http://www.xsens.com). |
| 144 | */ | 144 | */ |
| 145 | #define XSENS_VID 0x2639 | 145 | #define XSENS_VID 0x2639 |
| 146 | #define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */ | 146 | #define XSENS_AWINDA_STATION_PID 0x0101 |
| 147 | #define XSENS_AWINDA_DONGLE_PID 0x0102 | ||
| 147 | #define XSENS_MTW_PID 0x0200 /* Xsens MTw */ | 148 | #define XSENS_MTW_PID 0x0200 /* Xsens MTw */ |
| 149 | #define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */ | ||
| 150 | |||
| 151 | /* Xsens devices using FTDI VID */ | ||
| 148 | #define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */ | 152 | #define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */ |
| 149 | #define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */ | 153 | #define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */ |
| 150 | #define XSENS_CONVERTER_2_PID 0xD38A | 154 | #define XSENS_CONVERTER_2_PID 0xD38A |