Browse Source

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

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Michael Hennerich 16 years ago
parent
commit
b0d6590021
2 changed files with 9 additions and 0 deletions
  1. 2 0
      drivers/usb/serial/ftdi_sio.c
  2. 7 0
      drivers/usb/serial/ftdi_sio.h

+ 2 - 0
drivers/usb/serial/ftdi_sio.c

@@ -666,6 +666,8 @@ static struct usb_device_id id_table_combined [] = {
 	{ USB_DEVICE(ATMEL_VID, STK541_PID) },
 	{ USB_DEVICE(ATMEL_VID, STK541_PID) },
 	{ USB_DEVICE(DE_VID, STB_PID) },
 	{ USB_DEVICE(DE_VID, STB_PID) },
 	{ USB_DEVICE(DE_VID, WHT_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 */
 	{ },					/* Optional parameter entry */
 	{ }					/* Terminating entry */
 	{ }					/* Terminating entry */
 };
 };

+ 7 - 0
drivers/usb/serial/ftdi_sio.h

@@ -905,6 +905,13 @@
 #define STB_PID			0x0001 /* Sensor Terminal Board */
 #define STB_PID			0x0001 /* Sensor Terminal Board */
 #define WHT_PID			0x0004 /* Wireless Handheld Terminal */
 #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
  *   BmRequestType:  1100 0000b
  *   bRequest:       FTDI_E2_READ
  *   bRequest:       FTDI_E2_READ