diff options
author | Michał Wróbel <Michal.Wrobel@flytronic.pl> | 2012-03-09 08:40:18 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-09 15:39:52 -0500 |
commit | 47594d5528f28a4c025c2955c68104c75815637c (patch) | |
tree | 02b98c1c84ff315b06ae62ea6c62910d97b6073b /drivers/usb/serial | |
parent | 5db51b50c10f3bf56d5c636832c5556ead90562d (diff) |
USB: ftdi_sio: new PID: Distortec JTAG-lock-pick
Signed-off-by: Michał Wróbel <michal.wrobel@flytronic.pl>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index d8130993a922..4c53236f9baf 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -850,6 +850,8 @@ static struct usb_device_id id_table_combined [] = { | |||
850 | { USB_DEVICE(ST_VID, ST_STMCLT1030_PID), | 850 | { USB_DEVICE(ST_VID, ST_STMCLT1030_PID), |
851 | .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk }, | 851 | .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk }, |
852 | { USB_DEVICE(FTDI_VID, FTDI_RF_R106) }, | 852 | { USB_DEVICE(FTDI_VID, FTDI_RF_R106) }, |
853 | { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID), | ||
854 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
853 | { }, /* Optional parameter entry */ | 855 | { }, /* Optional parameter entry */ |
854 | { } /* Terminating entry */ | 856 | { } /* Terminating entry */ |
855 | }; | 857 | }; |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 2a87965b7723..ae55ca8a199b 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -97,6 +97,8 @@ | |||
97 | #define FTDI_TACTRIX_OPENPORT_13S_PID 0xCC49 /* OpenPort 1.3 Subaru */ | 97 | #define FTDI_TACTRIX_OPENPORT_13S_PID 0xCC49 /* OpenPort 1.3 Subaru */ |
98 | #define FTDI_TACTRIX_OPENPORT_13U_PID 0xCC4A /* OpenPort 1.3 Universal */ | 98 | #define FTDI_TACTRIX_OPENPORT_13U_PID 0xCC4A /* OpenPort 1.3 Universal */ |
99 | 99 | ||
100 | #define FTDI_DISTORTEC_JTAG_LOCK_PICK_PID 0xCFF8 | ||
101 | |||
100 | /* SCS HF Radio Modems PID's (http://www.scs-ptc.com) */ | 102 | /* SCS HF Radio Modems PID's (http://www.scs-ptc.com) */ |
101 | /* the VID is the standard ftdi vid (FTDI_VID) */ | 103 | /* the VID is the standard ftdi vid (FTDI_VID) */ |
102 | #define FTDI_SCS_DEVICE_0_PID 0xD010 /* SCS PTC-IIusb */ | 104 | #define FTDI_SCS_DEVICE_0_PID 0xD010 /* SCS PTC-IIusb */ |