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

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

USB: serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0 



Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7f82b6dd

drivers/usb/serial/ftdi_sio.c

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

	{ USB_DEVICE(DE_VID, STB_PID) },

	{ USB_DEVICE(DE_VID, WHT_PID) },

	{ USB_DEVICE(ADI_VID, ADI_GNICE_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ },					/* Optional parameter entry */

	{ }					/* Terminating entry */

};

drivers/usb/serial/ftdi_sio.h

+7 −0
Original line number Diff line number Diff line
@@ -905,6 +905,13 @@ 
#define STB_PID			0x0001 /* Sensor Terminal Board */

#define WHT_PID			0x0004 /* Wireless Handheld Terminal */



/*

 * Blackfin gnICE JTAG

 * http://docs.blackfin.uclinux.org/doku.php?id=hw:jtag:gnice

 */

#define ADI_VID 		0x0456

#define ADI_GNICE_PID 		0xF000



/*

 *   BmRequestType:  1100 0000b

 *   bRequest:       FTDI_E2_READ