aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorÉric Piel <piel@delmic.com>2012-09-04 11:25:06 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-05 19:43:49 -0400
commitdafc4f7be1a556ca3868d343c00127728b397068 (patch)
tree69be34f981981fd79048d77200c077aa23f1af49 /drivers/usb/serial/ftdi_sio.c
parentfea7a08acb13524b47711625eebea40a0ede69a0 (diff)
USB: ftdi-sio: add support for more Physik Instrumente devices
Commit b69cc672052540 added support for the E-861. After acquiring a C-867, I realised that every Physik Instrumente's device has a different PID. They are listed in the Windows device driver's .inf file. So here are all PIDs for the current (and probably future) USB devices from Physik Instrumente. Compiled, but only actually tested on the E-861 and C-867. Signed-off-by: Éric Piel <piel@delmic.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r--drivers/usb/serial/ftdi_sio.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 5620db6469e5..1197d4780b9a 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -810,7 +810,24 @@ static struct usb_device_id id_table_combined [] = {
810 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, 810 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
811 { USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) }, 811 { USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) },
812 { USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) }, 812 { USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) },
813 { USB_DEVICE(FTDI_VID, PI_C865_PID) },
814 { USB_DEVICE(FTDI_VID, PI_C857_PID) },
815 { USB_DEVICE(PI_VID, PI_C866_PID) },
816 { USB_DEVICE(PI_VID, PI_C663_PID) },
817 { USB_DEVICE(PI_VID, PI_C725_PID) },
818 { USB_DEVICE(PI_VID, PI_E517_PID) },
819 { USB_DEVICE(PI_VID, PI_C863_PID) },
813 { USB_DEVICE(PI_VID, PI_E861_PID) }, 820 { USB_DEVICE(PI_VID, PI_E861_PID) },
821 { USB_DEVICE(PI_VID, PI_C867_PID) },
822 { USB_DEVICE(PI_VID, PI_E609_PID) },
823 { USB_DEVICE(PI_VID, PI_E709_PID) },
824 { USB_DEVICE(PI_VID, PI_100F_PID) },
825 { USB_DEVICE(PI_VID, PI_1011_PID) },
826 { USB_DEVICE(PI_VID, PI_1012_PID) },
827 { USB_DEVICE(PI_VID, PI_1013_PID) },
828 { USB_DEVICE(PI_VID, PI_1014_PID) },
829 { USB_DEVICE(PI_VID, PI_1015_PID) },
830 { USB_DEVICE(PI_VID, PI_1016_PID) },
814 { USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) }, 831 { USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) },
815 { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, 832 { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
816 { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), 833 { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),