diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2009-03-06 14:07:43 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-23 14:55:28 -0700 |
| commit | ff2e20ee916a36a1b2b9983cd494823ff5bc59bd (patch) | |
| tree | 20f8376691c2ef4c1eb7136bc65cada0e7b17582 | |
| parent | 079922cc01673f0eac18ca7b3e358cc40d68fdaf (diff) | |
| download | linux-stable-ff2e20ee916a36a1b2b9983cd494823ff5bc59bd.tar.gz | |
USB: serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0
commit b0d659002168146ec6b03d1ef062d8dcf05ff510 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 8325685898e2..aa21adb18752 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -663,6 +663,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 */ }; diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index 6a2e82275be7..171a97c32f83 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h @@ -894,6 +894,13 @@ #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 * wValue: 0 |