diff options
author | Matthijs Kooijman <matthijs@stdin.nl> | 2015-08-18 04:33:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-18 13:07:40 -0400 |
commit | 1fb8dc36384ae1140ee6ccc470de74397606a9d5 (patch) | |
tree | 6f0fbdcb497cdb5d9087957cf218000b3c012f24 | |
parent | d2958d1b8fb0cffa362b187c0375a5aff4fe3825 (diff) |
USB: ftdi_sio: Added custom PID for CustomWare products
CustomWare uses the FTDI VID with custom PIDs for their ShipModul MiniPlex
products.
Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 4c8b3b82103d..a5a0376bbd48 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -605,6 +605,10 @@ static const struct usb_device_id id_table_combined[] = { | |||
605 | { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID), | 605 | { USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID), |
606 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 606 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
607 | { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) }, | 607 | { USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) }, |
608 | { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) }, | ||
609 | { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) }, | ||
610 | { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2WI_PID) }, | ||
611 | { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX3_PID) }, | ||
608 | /* | 612 | /* |
609 | * ELV devices: | 613 | * ELV devices: |
610 | */ | 614 | */ |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index cb12b319d008..67c6d4469730 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -568,6 +568,14 @@ | |||
568 | */ | 568 | */ |
569 | #define FTDI_SYNAPSE_SS200_PID 0x9090 /* SS200 - SNAP Stick 200 */ | 569 | #define FTDI_SYNAPSE_SS200_PID 0x9090 /* SS200 - SNAP Stick 200 */ |
570 | 570 | ||
571 | /* | ||
572 | * CustomWare / ShipModul NMEA multiplexers product ids (FTDI_VID) | ||
573 | */ | ||
574 | #define FTDI_CUSTOMWARE_MINIPLEX_PID 0xfd48 /* MiniPlex first generation NMEA Multiplexer */ | ||
575 | #define FTDI_CUSTOMWARE_MINIPLEX2_PID 0xfd49 /* MiniPlex-USB and MiniPlex-2 series */ | ||
576 | #define FTDI_CUSTOMWARE_MINIPLEX2WI_PID 0xfd4a /* MiniPlex-2Wi */ | ||
577 | #define FTDI_CUSTOMWARE_MINIPLEX3_PID 0xfd4b /* MiniPlex-3 series */ | ||
578 | |||
571 | 579 | ||
572 | /********************************/ | 580 | /********************************/ |
573 | /** third-party VID/PID combos **/ | 581 | /** third-party VID/PID combos **/ |