diff options
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 1 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index ff06c01a555b..0b9baaf0da90 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -502,6 +502,7 @@ static struct usb_device_id id_table_combined [] = { | |||
| 502 | { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) }, | 502 | { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) }, |
| 503 | { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) }, | 503 | { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) }, |
| 504 | { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) }, | 504 | { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) }, |
| 505 | { USB_DEVICE(TESTO_VID, TESTO_USB_INTERFACE_PID) }, | ||
| 505 | { }, /* Optional parameter entry */ | 506 | { }, /* Optional parameter entry */ |
| 506 | { } /* Terminating entry */ | 507 | { } /* Terminating entry */ |
| 507 | }; | 508 | }; |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 024e5512d600..04ef90fcb876 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -450,6 +450,13 @@ | |||
| 450 | */ | 450 | */ |
| 451 | #define FTDI_THORLABS_PID 0xfaf0 /* ThorLabs USB motor drivers */ | 451 | #define FTDI_THORLABS_PID 0xfaf0 /* ThorLabs USB motor drivers */ |
| 452 | 452 | ||
| 453 | /* | ||
| 454 | * Testo products (http://www.testo.com/) | ||
| 455 | * Submitted by Colin Leroy | ||
| 456 | */ | ||
| 457 | #define TESTO_VID 0x128D | ||
| 458 | #define TESTO_USB_INTERFACE_PID 0x0001 | ||
| 459 | |||
| 453 | /* Commands */ | 460 | /* Commands */ |
| 454 | #define FTDI_SIO_RESET 0 /* Reset the port */ | 461 | #define FTDI_SIO_RESET 0 /* Reset the port */ |
| 455 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ | 462 | #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */ |
