diff options
author | Éric Piel <piel@delmic.com> | 2012-05-07 06:37:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-01 03:12:56 -0400 |
commit | 03f9babeb1874d239998c8a42380da1a0eb25b5f (patch) | |
tree | de18eb35447bf901d3d6e4ff043dd1c183194e2f | |
parent | 3c867337cdb88f7b31f9fcf07003e97d408fcd26 (diff) |
USB: ftdi-sio: add support for Physik Instrumente E-861
commit b69cc672052540e8efb1368420f10d7d4d8b8a3d upstream.
This adds VID/PID for the PI E-861. Without it, I had to do:
modprobe -q ftdi-sio product=0x1008 vendor=0x1a72
http://www.physikinstrumente.com/en/products/prdetail.php?sortnr=900610
Signed-off-by: Éric Piel <piel@delmic.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 60d7b1ebdde..f08d494dedb 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -807,6 +807,7 @@ static struct usb_device_id id_table_combined [] = { | |||
807 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 807 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
808 | { USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) }, | 808 | { USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) }, |
809 | { USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) }, | 809 | { USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) }, |
810 | { USB_DEVICE(PI_VID, PI_E861_PID) }, | ||
810 | { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, | 811 | { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, |
811 | { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), | 812 | { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), |
812 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 813 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index c6dd18e346b..219b199eff5 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -785,6 +785,14 @@ | |||
785 | #define RTSYSTEMS_SERIAL_VX7_PID 0x9e52 /* Serial converter for VX-7 Radios using FT232RL */ | 785 | #define RTSYSTEMS_SERIAL_VX7_PID 0x9e52 /* Serial converter for VX-7 Radios using FT232RL */ |
786 | #define RTSYSTEMS_CT29B_PID 0x9e54 /* CT29B Radio Cable */ | 786 | #define RTSYSTEMS_CT29B_PID 0x9e54 /* CT29B Radio Cable */ |
787 | 787 | ||
788 | |||
789 | /* | ||
790 | * Physik Instrumente | ||
791 | * http://www.physikinstrumente.com/en/products/ | ||
792 | */ | ||
793 | #define PI_VID 0x1a72 /* Vendor ID */ | ||
794 | #define PI_E861_PID 0x1008 /* E-861 piezo controller USB connection */ | ||
795 | |||
788 | /* | 796 | /* |
789 | * Bayer Ascensia Contour blood glucose meter USB-converter cable. | 797 | * Bayer Ascensia Contour blood glucose meter USB-converter cable. |
790 | * http://winglucofacts.com/cables/ | 798 | * http://winglucofacts.com/cables/ |