Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11eaf170 authored by Michael Hennerich's avatar Michael Hennerich Committed by Greg Kroah-Hartman
Browse files

USB: serial: ftdi: handle gnICE+ JTAG adaptors 



Detect the UART on interface1 and blacklist interface0 (as that is the
JTAG port).

Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent eb661bc8

drivers/usb/serial/ftdi_sio.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -697,6 +697,8 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(DE_VID, WHT_PID) },

	{ USB_DEVICE(DE_VID, WHT_PID) },

	{ USB_DEVICE(ADI_VID, ADI_GNICE_PID),

	{ USB_DEVICE(ADI_VID, ADI_GNICE_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },

	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },

	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),

	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

drivers/usb/serial/ftdi_sio.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -933,6 +933,7 @@ 
 */

 */

#define ADI_VID 		0x0456

#define ADI_VID 		0x0456

#define ADI_GNICE_PID 		0xF000

#define ADI_GNICE_PID 		0xF000

#define ADI_GNICEPLUS_PID 	0xF001





/*

/*

 * JETI SPECTROMETER SPECBOS 1201

 * JETI SPECTROMETER SPECBOS 1201