diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2020-10-17 12:36:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2020-10-17 12:36:27 +0200 |
| commit | 887cae0a5083d67ca72016144a8e72258f41877c (patch) | |
| tree | 3dda5ca5c102298ea0144114c9c9b60026293bcf /drivers/usb/serial/ftdi_sio.c | |
| parent | c7826d812d44a1ed7fd920955c4b84759eda92e5 (diff) | |
| parent | d98913ec3269a460636da0e4e8c72f594fb756c0 (diff) | |
Merge 4.4.240 into android-4.4-p
Changes in 4.4.240
Bluetooth: A2MP: Fix not initializing all members
Bluetooth: MGMT: Fix not checking if BT_HS is enabled
Bluetooth: fix kernel oops in store_pending_adv_report
Bluetooth: Consolidate encryption handling in hci_encrypt_cfm
Bluetooth: Fix update of connection state in `hci_encrypt_cfm`
Bluetooth: Disconnect if E0 is used for Level 4
media: usbtv: Fix refcounting mixup
USB: serial: option: add Cellient MPL200 card
USB: serial: option: Add Telit FT980-KS composition
staging: comedi: check validity of wMaxPacketSize of usb endpoints found
USB: serial: pl2303: add device-id for HP GC device
USB: serial: ftdi_sio: add support for FreeCalypso JTAG+UART adapters
reiserfs: Initialize inode keys properly
reiserfs: Fix oops during mount
spi: unbinding slave before calling spi_destroy_queue
crypto: qat - check cipher length for aead AES-CBC-HMAC-SHA
Linux 4.4.240
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I194dca828914f8573fbdf725f353775c934a2423
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 25e76d4c1505..5b42b8d760cb 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1032,6 +1032,11 @@ static const struct usb_device_id id_table_combined[] = { /* U-Blox devices */ { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) }, { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) }, + /* FreeCalypso USB adapters */ + { USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_BUF_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, + { USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_UNBUF_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { } /* Terminating entry */ }; |