nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

USB: serial: ftdi_sio: add Id for Physik Instrumente E-870

Browse source 
This adds support for the Physik Instrumente E-870 PIShift Drive
Electronics, a Piezo motor driver.

Signed-off-by: Martin Teichmann <martin.teichmann@xfel.eu>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Teichmann, Martin 2018-03-29 08:39:37 +02:00 committed by Johan Hovold
parent 9b284d8e64
commit 79a0b33165
2 changed files with 2 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/usb/serial/ftdi_sio.c
View file

@ -893,6 +893,7 @@ static const struct usb_device_id id_table_combined[] = {
{ USB_DEVICE(PI_VID, PI_1014_PID) }, { USB_DEVICE(PI_VID, PI_1014_PID) },
{ USB_DEVICE(PI_VID, PI_1015_PID) }, { USB_DEVICE(PI_VID, PI_1015_PID) },
{ USB_DEVICE(PI_VID, PI_1016_PID) }, { USB_DEVICE(PI_VID, PI_1016_PID) },
{ USB_DEVICE(PI_VID, PI_E870_PID) },
{ USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) }, { USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) },
{ USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) }, { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID), { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),

1
drivers/usb/serial/ftdi_sio_ids.h
View file

@ -978,6 +978,7 @@
#define PI_1014_PID 0x1014 /* PI Device */ #define PI_1014_PID 0x1014 /* PI Device */
#define PI_1015_PID 0x1015 /* PI Device */ #define PI_1015_PID 0x1015 /* PI Device */
#define PI_1016_PID 0x1016 /* PI Digital Servo Module */ #define PI_1016_PID 0x1016 /* PI Digital Servo Module */
#define PI_E870_PID 0x1019 /* PI E-870 Piezomotor Controller */
/* /*
* Kondo Kagaku Co.Ltd. * Kondo Kagaku Co.Ltd.