aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorMatthijs Kooijman <matthijs@stdin.nl>2015-08-18 10:33:56 +0200
committerBen Hutchings <ben@decadent.org.uk>2015-10-13 03:46:06 +0100
commit392a99c8cf2b6d8ff119871006879b6173524731 (patch)
treec6f4d9bfe58e7e10667b96ff3381bc7bd81077a6 /drivers/usb/serial/ftdi_sio.c
parent586491f5bed09e099499642b3ad3ffdbe6f240b5 (diff)
downloadkernel_samsung_smdk4412-392a99c8cf2b6d8ff119871006879b6173524731.zip
kernel_samsung_smdk4412-392a99c8cf2b6d8ff119871006879b6173524731.tar.gz
kernel_samsung_smdk4412-392a99c8cf2b6d8ff119871006879b6173524731.tar.bz2
USB: ftdi_sio: Added custom PID for CustomWare products
commit 1fb8dc36384ae1140ee6ccc470de74397606a9d5 upstream. CustomWare uses the FTDI VID with custom PIDs for their ShipModul MiniPlex products. Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r--drivers/usb/serial/ftdi_sio.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 8257d3b..4ffaa9d 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -629,6 +629,10 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID),
.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
{ USB_DEVICE(FTDI_VID, FTDI_SYNAPSE_SS200_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX2WI_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_CUSTOMWARE_MINIPLEX3_PID) },
/*
* ELV devices:
*/