linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
	Zwane Mwaikambo <zwane@arm.linux.org.uk>,
	"Theodore Ts'o" <tytso@mit.edu>,
	Randy Dunlap <rdunlap@xenotime.net>,
	Dave Jones <davej@redhat.com>,
	Chuck Wolber <chuckw@quantumlinux.com>,
	Chris Wedgwood <reviews@ml.cw.f00f.org>,
	Michael Krufky <mkrufky@linuxtv.org>,
	Chuck Ebbert <cebbert@redhat.com>,
	Domenico Andreoli <cavokz@gmail.com>, Willy Tarreau <w@1wt.eu>,
	Rodrigo Rubira Branco <rbranco@la.checkpoint.com>,
	Jake Edge <jake@lwn.net>, Eugene Teo <eteo@redhat.com>,
	torvalds@linux-foundation.org, akpm@linux-foundation.org,
	alan@lxorguk.ukuu.org.uk,
	Michael Hennerich <michael.hennerich@analog.com>,
	Bryan Wu <cooloney@kernel.org>
Subject: [patch 27/32] USB: serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0
Date: Fri, 20 Mar 2009 15:26:38 -0700	[thread overview]
Message-ID: <20090320222713.225166672@mini.kroah.org> (raw)
In-Reply-To: <20090320231037.GA2732@kroah.com>

[-- Attachment #1: usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0.patch --]
[-- Type: text/plain, Size: 1386 bytes --]

2.6.27-stable review patch.  If anyone has any objections, please let us know.

------------------

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
@@ -660,6 +660,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
@@ -883,6 +883,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



  parent reply	other threads:[~2009-03-20 23:23 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20090320222611.872315885@mini.kroah.org>
2009-03-20 23:10 ` [patch 00/32] 2.6.27.21-stable review Greg KH
2009-03-20 22:26   ` [patch 01/32] [IA64] Build fix for __early_pfn_to_nid() undefined link error Greg KH
2009-03-20 22:26   ` [patch 02/32] Add -fwrapv to gcc CFLAGS Greg KH
2009-03-20 22:26   ` [patch 03/32] Move cc-option to below arch-specific setup Greg KH
2009-03-20 22:26   ` [patch 04/32] nfsd: nfsd should drop CAP_MKNOD for non-root Greg KH
2009-03-20 22:26   ` [patch 05/32] NFSD: provide encode routine for OP_OPENATTR Greg KH
2009-03-20 22:26   ` [patch 06/32] ALSA: Fix vunmap and free order in snd_free_sgbuf_pages() Greg KH
2009-03-20 22:26   ` [patch 07/32] ALSA: hda - Fix DMA mask for ATI controllers Greg KH
2009-03-20 22:26   ` [patch 08/32] ALSA: mixart, fix lock imbalance Greg KH
2009-03-20 22:26   ` [patch 09/32] ALSA: pcm_oss, fix locking typo Greg KH
2009-03-20 22:26   ` [patch 10/32] ata_piix: add workaround for Samsung DB-P70 Greg KH
2009-03-20 22:26   ` [patch 11/32] dm crypt: fix kcryptd_async_done parameter Greg KH
2009-03-20 22:26   ` [patch 12/32] dm ioctl: validate name length when renaming Greg KH
2009-03-20 22:26   ` [patch 13/32] dm io: respect BIO_MAX_PAGES limit Greg KH
2009-03-20 22:26   ` [patch 14/32] eventfd: remove fput() call from possible IRQ context Greg KH
2009-03-20 22:26   ` [patch 15/32] S390: __div64_31 broken for CONFIG_MARCH_G5 Greg KH
2009-03-20 22:26   ` [patch 16/32] thinkpad-acpi: fix module autoloading for older models Greg KH
2009-03-20 22:26   ` [patch 17/32] V4L/DVB (10218): cx23885: Fix Oops for mixed install of analog and digital only cards Greg KH
2009-03-20 22:26   ` [patch 18/32] Fix misreporting of #cores as #hyperthreads for Q9550 Greg KH
2009-03-20 22:26   ` [patch 19/32] powerpc: Remove extra semicolon in fsl_soc.c Greg KH
2009-03-20 22:26   ` [patch 20/32] USB: EHCI: expedite unlinks when the root hub is suspended Greg KH
2009-03-20 22:26   ` [patch 21/32] USB: EHCI: Fix isochronous URB leak Greg KH
2009-03-20 22:26   ` [patch 22/32] USB: Add Vendor/Product ID for new CDMA U727 to option driver Greg KH
2009-03-20 22:26   ` [patch 23/32] USB: option.c: add ZTE 622 modem device Greg KH
2009-03-20 22:26   ` [patch 24/32] USB: Add device id for Option GTM380 to option driver Greg KH
2009-03-20 22:26   ` [patch 25/32] USB: Option: let cdc-acm handle Sony Ericsson F3507g / Dell 5530 Greg KH
2009-03-20 22:26   ` [patch 26/32] USB: serial: add FTDI USB/Serial converter devices Greg KH
2009-03-20 22:26   ` Greg KH [this message]
2009-03-20 22:26   ` [patch 28/32] USB: serial: new cp2101 device id Greg KH
2009-03-20 22:26   ` [patch 29/32] USB: storage: Unusual USB device Prolific 2507 variation added Greg KH
2009-03-20 22:26   ` [patch 30/32] USB: unusual_devs: Add support for GI 0431 SD-Card interface Greg KH
2009-03-20 22:26   ` [patch 31/32] USB: Updated unusual-devs entry for USB mass storage on Nokia 6233 Greg KH
2009-03-20 22:26   ` [patch 32/32] USB: usbfs: keep async URBs until the device file is closed Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090320222713.225166672@mini.kroah.org \
    --to=gregkh@suse.de \
    --cc=akpm@linux-foundation.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=cavokz@gmail.com \
    --cc=cebbert@redhat.com \
    --cc=chuckw@quantumlinux.com \
    --cc=cooloney@kernel.org \
    --cc=davej@redhat.com \
    --cc=eteo@redhat.com \
    --cc=jake@lwn.net \
    --cc=jmforbes@linuxtx.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael.hennerich@analog.com \
    --cc=mkrufky@linuxtv.org \
    --cc=rbranco@la.checkpoint.com \
    --cc=rdunlap@xenotime.net \
    --cc=reviews@ml.cw.f00f.org \
    --cc=stable@kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=tytso@mit.edu \
    --cc=w@1wt.eu \
    --cc=zwane@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).