* [merged] usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0.patch removed from -mm tree
@ 2009-03-12 20:16 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2009-03-12 20:16 UTC (permalink / raw)
To: michael.hennerich, cooloney, greg, mm-commits
The patch titled
usb/serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0
has been removed from the -mm tree. Its filename was
usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: usb/serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0
From: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/usb/serial/ftdi_sio.c | 2 ++
drivers/usb/serial/ftdi_sio.h | 7 +++++++
2 files changed, 9 insertions(+)
diff -puN drivers/usb/serial/ftdi_sio.c~usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0 drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio.c~usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0
+++ a/drivers/usb/serial/ftdi_sio.c
@@ -666,6 +666,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 */
};
diff -puN drivers/usb/serial/ftdi_sio.h~usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0 drivers/usb/serial/ftdi_sio.h
--- a/drivers/usb/serial/ftdi_sio.h~usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0
+++ a/drivers/usb/serial/ftdi_sio.h
@@ -906,6 +906,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
_
Patches currently in -mm which might be from michael.hennerich@analog.com are
origin.patch
linux-next.patch
blackfin-spi-driver-fix-erroneous-spi-clock-divisor-calculation.patch
blackfin-spi-driver-add-gpio-controlled-spi-slave-select-support.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-12 20:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-12 20:16 [merged] usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.