| From b0d659002168146ec6b03d1ef062d8dcf05ff510 Mon Sep 17 00:00:00 2001 |
| From: Michael Hennerich <michael.hennerich@analog.com> |
| Date: Fri, 6 Mar 2009 14:07:43 -0800 |
| Subject: USB: serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0 |
| |
| From: Michael Hennerich <michael.hennerich@analog.com> |
| |
| 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> |
| |
| --- |
| drivers/usb/serial/ftdi_sio.c | 2 ++ |
| drivers/usb/serial/ftdi_sio.h | 7 +++++++ |
| 2 files changed, 9 insertions(+) |
| |
| --- 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_com |
| { 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 */ |
| }; |
| --- 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 |
