diff options
author | Martin Teichmann <lkb.teichmann@gmail.com> | 2012-11-21 10:45:07 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 18:53:02 -0500 |
commit | d7e14b375b40c04cd735b115713043b69a2c68ac (patch) | |
tree | d8571c5a8f2aea1c7c971f8ca94aa8c6409033c4 | |
parent | 405d39111e3aa656058a7452440eead8514094d3 (diff) |
USB: ftdi_sio: Add support for Newport AGILIS motor drivers
The Newport AGILIS model AG-UC8 compact piezo motor controller
(http://search.newport.com/?q=*&x2=sku&q2=AG-UC8)
is yet another device using an FTDI USB-to-serial chip. It works
fine with the ftdi_sio driver when adding
options ftdi-sio product=0x3000 vendor=0x104d
to modprobe.d. udevadm reports "Newport" as the manufacturer,
and "Agilis" as the product name.
Signed-off-by: Martin Teichmann <lkb.teichmann@gmail.com>
Cc: stable <stable@vger.kernel.org>
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 | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index e1203bdede15..0a373b3ae96a 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -191,6 +191,7 @@ static struct usb_device_id id_table_combined [] = { | |||
191 | { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_THROTTLE_PID) }, | 191 | { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_THROTTLE_PID) }, |
192 | { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GATEWAY_PID) }, | 192 | { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GATEWAY_PID) }, |
193 | { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GBM_PID) }, | 193 | { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GBM_PID) }, |
194 | { USB_DEVICE(NEWPORT_VID, NEWPORT_AGILIS_PID) }, | ||
194 | { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) }, | 195 | { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) }, |
195 | { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) }, | 196 | { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) }, |
196 | { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) }, | 197 | { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) }, |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 57c12ef6625e..049b6e715fa4 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -752,6 +752,12 @@ | |||
752 | #define TTI_VID 0x103E /* Vendor Id */ | 752 | #define TTI_VID 0x103E /* Vendor Id */ |
753 | #define TTI_QL355P_PID 0x03E8 /* TTi QL355P power supply */ | 753 | #define TTI_QL355P_PID 0x03E8 /* TTi QL355P power supply */ |
754 | 754 | ||
755 | /* | ||
756 | * Newport Cooperation (www.newport.com) | ||
757 | */ | ||
758 | #define NEWPORT_VID 0x104D | ||
759 | #define NEWPORT_AGILIS_PID 0x3000 | ||
760 | |||
755 | /* Interbiometrics USB I/O Board */ | 761 | /* Interbiometrics USB I/O Board */ |
756 | /* Developed for Interbiometrics by Rudolf Gugler */ | 762 | /* Developed for Interbiometrics by Rudolf Gugler */ |
757 | #define INTERBIOMETRICS_VID 0x1209 | 763 | #define INTERBIOMETRICS_VID 0x1209 |