git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From b0d659002168146ec6b03d1ef062d8dcf05ff510 Mon Sep 17 00:00:00 2001
   2 From: Michael Hennerich <michael.hennerich@analog.com>
   3 Date: Fri, 6 Mar 2009 14:07:43 -0800
   4 Subject: USB: serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0
   5
   6 From: Michael Hennerich <michael.hennerich@analog.com>
   7
   8 commit b0d659002168146ec6b03d1ef062d8dcf05ff510 upstream.
   9
  10 Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
  11 Signed-off-by: Bryan Wu <cooloney@kernel.org>
  12 Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  13 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  14
  15 ---
  16  drivers/usb/serial/ftdi_sio.c |    2 ++
  17  drivers/usb/serial/ftdi_sio.h |    7 +++++++
  18  2 files changed, 9 insertions(+)
  19
  20 --- a/drivers/usb/serial/ftdi_sio.c
  21 +++ b/drivers/usb/serial/ftdi_sio.c
  22 @@ -660,6 +660,8 @@ static struct usb_device_id id_table_com
  23         { USB_DEVICE(ATMEL_VID, STK541_PID) },
  24         { USB_DEVICE(DE_VID, STB_PID) },
  25         { USB_DEVICE(DE_VID, WHT_PID) },
  26 +       { USB_DEVICE(ADI_VID, ADI_GNICE_PID),
  27 +               .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
  28         { },                                    /* Optional parameter entry */
  29         { }                                     /* Terminating entry */
  30  };
  31 --- a/drivers/usb/serial/ftdi_sio.h
  32 +++ b/drivers/usb/serial/ftdi_sio.h
  33 @@ -883,6 +883,13 @@
  34  #define WHT_PID                        0x0004 /* Wireless Handheld Terminal */
  35
  36  /*
  37 + * Blackfin gnICE JTAG
  38 + * http://docs.blackfin.uclinux.org/doku.php?id=hw:jtag:gnice
  39 + */
  40 +#define ADI_VID                0x0456
  41 +#define ADI_GNICE_PID          0xF000
  42 +
  43 +/*
  44   *   BmRequestType:  1100 0000b
  45   *   bRequest:       FTDI_E2_READ
  46   *   wValue:         0