| From: Adrian Thomasset <adrian.thomasset@st.com> |
| Date: Tue, 23 Apr 2013 12:46:29 +0100 |
| Subject: USB: ftdi_sio: correct ST Micro Connect Lite PIDs |
| |
| commit 9f06d15f8db6946e41f73196a122b84a37938878 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/usb/serial/ftdi_sio.c | 4 +++- |
| drivers/usb/serial/ftdi_sio_ids.h | 3 ++- |
| 2 files changed, 5 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/usb/serial/ftdi_sio.c |
| +++ b/drivers/usb/serial/ftdi_sio.c |
| @@ -877,7 +877,9 @@ static struct usb_device_id id_table_com |
| { USB_DEVICE(FTDI_VID, FTDI_DOTEC_PID) }, |
| { USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID), |
| .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| - { USB_DEVICE(ST_VID, ST_STMCLT1030_PID), |
| + { USB_DEVICE(ST_VID, ST_STMCLT_2232_PID), |
| + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| + { USB_DEVICE(ST_VID, ST_STMCLT_4232_PID), |
| .driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk }, |
| { USB_DEVICE(FTDI_VID, FTDI_RF_R106) }, |
| { USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID), |
| --- a/drivers/usb/serial/ftdi_sio_ids.h |
| +++ b/drivers/usb/serial/ftdi_sio_ids.h |
| @@ -1151,7 +1151,8 @@ |
| * STMicroelectonics |
| */ |
| #define ST_VID 0x0483 |
| -#define ST_STMCLT1030_PID 0x3747 /* ST Micro Connect Lite STMCLT1030 */ |
| +#define ST_STMCLT_2232_PID 0x3746 |
| +#define ST_STMCLT_4232_PID 0x3747 |
| |
| /* |
| * Papouch products (http://www.papouch.com/) |