diff options
| author | Adrian Thomasset <adrian.thomasset@st.com> | 2013-04-23 07:46:29 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-23 13:08:13 -0400 |
| commit | 9f06d15f8db6946e41f73196a122b84a37938878 (patch) | |
| tree | 693f22df5b669f04ac9ffb2ca609cce6b48b3326 | |
| parent | 0b9b6df9ee57d2af7788a0ad95ea6f425a688159 (diff) | |
USB: ftdi_sio: correct ST Micro Connect Lite PIDs
The current ST Micro Connect Lite uses the FT4232H hi-speed quad USB
UART FTDI chip. It is also possible to drive STM reference targets
populated with an on-board JTAG debugger based on the FT2232H chip with
the same STMicroelectronics tools.
For this reason, the ST Micro Connect Lite PIDs should be
ST_STMCLT_2232_PID: 0x3746
ST_STMCLT_4232_PID: 0x3747
Signed-off-by: Adrian Thomasset <adrian.thomasset@st.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 | 4 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index fc7bd147d3b1..e4d7fbd7e4e7 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -869,7 +869,9 @@ static struct usb_device_id id_table_combined [] = { | |||
| 869 | { USB_DEVICE(FTDI_VID, FTDI_DOTEC_PID) }, | 869 | { USB_DEVICE(FTDI_VID, FTDI_DOTEC_PID) }, |
| 870 | { USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID), | 870 | { USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID), |
| 871 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 871 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| 872 | { USB_DEVICE(ST_VID, ST_STMCLT1030_PID), | 872 | { USB_DEVICE(ST_VID, ST_STMCLT_2232_PID), |
| 873 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | ||
| 874 | { USB_DEVICE(ST_VID, ST_STMCLT_4232_PID), | ||
| 873 | .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk }, | 875 | .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk }, |
| 874 | { USB_DEVICE(FTDI_VID, FTDI_RF_R106) }, | 876 | { USB_DEVICE(FTDI_VID, FTDI_RF_R106) }, |
| 875 | { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID), | 877 | { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID), |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 3c003512f60a..98528270c43c 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
| @@ -1151,7 +1151,8 @@ | |||
| 1151 | * STMicroelectonics | 1151 | * STMicroelectonics |
| 1152 | */ | 1152 | */ |
| 1153 | #define ST_VID 0x0483 | 1153 | #define ST_VID 0x0483 |
| 1154 | #define ST_STMCLT1030_PID 0x3747 /* ST Micro Connect Lite STMCLT1030 */ | 1154 | #define ST_STMCLT_2232_PID 0x3746 |
| 1155 | #define ST_STMCLT_4232_PID 0x3747 | ||
| 1155 | 1156 | ||
| 1156 | /* | 1157 | /* |
| 1157 | * Papouch products (http://www.papouch.com/) | 1158 | * Papouch products (http://www.papouch.com/) |