[kernel] r13623 - in dists/sid/linux-2.6/debian: . patches/features/all patches/series

[Martin Michlmayr]

Author: tbm
Date: Sat May 16 08:42:03 2009
New Revision: 13623

Log:
USB: ftdi_sio: add vendor/product id for the Marvell SheevaPlug

Added:
   dists/sid/linux-2.6/debian/patches/features/all/ftdi_sio-sheevaplug.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/5

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat May 16 08:37:27 2009	(r13622)
+++ dists/sid/linux-2.6/debian/changelog	Sat May 16 08:42:03 2009	(r13623)
@@ -9,6 +9,7 @@
   [ Martin Michlmayr ]
   * Broadcom SB: fix locking in set_irq_affinity.
   * mmc: load mvsdio automatically when it's a platform device.
+  * USB: ftdi_sio: add vendor/product id for the Marvell SheevaPlug.
 
   [ Bastian Blank ]
   * Add stable release 2.6.29.3:

Added: dists/sid/linux-2.6/debian/patches/features/all/ftdi_sio-sheevaplug.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/ftdi_sio-sheevaplug.patch	Sat May 16 08:42:03 2009	(r13623)
@@ -0,0 +1,45 @@
+From: Nicolas Pitre <nico at cam.org>
+Date: Fri, 24 Apr 2009 02:38:12 +0000 (-0400)
+Subject: USB: ftdi_sio: add vendor/product id for the Marvell SheevaPlug
+X-Git-Tag: v2.6.30-rc6~42^2~4
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1002bb77c0b7f1241a5108ffa04d836ddc5060c0
+
+USB: ftdi_sio: add vendor/product id for the Marvell SheevaPlug
+
+For reference:
+http://www.marvell.com/products/embedded_processors/developer/kirkwood/sheevaplug.jsp
+
+Signed-off-by: Nicolas Pitre <nico at marvell.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+
+diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
+index 8100f1d..aab5676 100644
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -669,6 +669,8 @@ static struct usb_device_id id_table_combined [] = {
+ 	{ USB_DEVICE(ADI_VID, ADI_GNICE_PID),
+ 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+ 	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
++	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_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 c09f658..12330fa 100644
+--- a/drivers/usb/serial/ftdi_sio.h
++++ b/drivers/usb/serial/ftdi_sio.h
+@@ -920,6 +920,12 @@
+ #define JETI_SPC1201_PID	0x04b2
+ 
+ /*
++ * Marvell SheevaPlug
++ */
++#define MARVELL_VID		0x9e88
++#define MARVELL_SHEEVAPLUG_PID	0x9e8f
++
++/*
+  *   BmRequestType:  1100 0000b
+  *   bRequest:       FTDI_E2_READ
+  *   wValue:         0

Modified: dists/sid/linux-2.6/debian/patches/series/5
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/5	Sat May 16 08:37:27 2009	(r13622)
+++ dists/sid/linux-2.6/debian/patches/series/5	Sat May 16 08:42:03 2009	(r13623)
@@ -7,3 +7,4 @@
 + bugfix/all/stable/2.6.29.3.patch
 + bugfix/all/stable/2.6.29.3-abi-1.patch
 + bugfix/sparc/ftbfs.patch
++ features/all/ftdi_sio-sheevaplug.patch