aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Riphagen <patrick.riphagen@xsens.com>2014-07-24 03:09:50 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-01 18:47:05 -0400
commit4bdcde358b4bda74e356841d351945ca3f2245dd (patch)
treef718a57b2d626ff64a9b0dfe04d252f1348b2714
parent9273b8a270878906540349422ab24558b9d65716 (diff)
USB: serial: ftdi_sio: Add support for new Xsens devices
This adds support for new Xsens devices, using Xsens' own Vendor ID. Signed-off-by: Patrick Riphagen <patrick.riphagen@xsens.com> Signed-off-by: Frans Klaver <frans.klaver@xsens.com> Cc: Johan Hovold <johan@kernel.org> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
-rw-r--r--drivers/usb/serial/ftdi_sio_ids.h3
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index b9035c319766..216ce3078270 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -660,6 +660,8 @@ static const struct usb_device_id id_table_combined[] = {
660 { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) }, 660 { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) },
661 { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) }, 661 { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) },
662 { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) }, 662 { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
663 { USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },
664 { USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },
663 { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) }, 665 { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
664 { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) }, 666 { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
665 { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) }, 667 { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 3fc789701e45..1e58d90a0b6c 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -140,6 +140,9 @@
140/* 140/*
141 * Xsens Technologies BV products (http://www.xsens.com). 141 * Xsens Technologies BV products (http://www.xsens.com).
142 */ 142 */
143#define XSENS_VID 0x2639
144#define XSENS_CONVERTER_PID 0xD00D /* Xsens USB-serial converter */
145#define XSENS_MTW_PID 0x0200 /* Xsens MTw */
143#define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */ 146#define XSENS_CONVERTER_0_PID 0xD388 /* Xsens USB converter */
144#define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */ 147#define XSENS_CONVERTER_1_PID 0xD389 /* Xsens Wireless Receiver */
145#define XSENS_CONVERTER_2_PID 0xD38A 148#define XSENS_CONVERTER_2_PID 0xD38A