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

[Martin Michlmayr]

Author: tbm
Date: Sat Jun  6 11:52:44 2009
New Revision: 13735

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

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

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Sat Jun  6 11:26:23 2009	(r13734)
+++ dists/lenny/linux-2.6/debian/changelog	Sat Jun  6 11:52:44 2009	(r13735)
@@ -22,6 +22,7 @@
   [ Martin Michlmayr ]
   * cdc-acm: Add quirk for MTK II GPS, such as Qstarz BT-Q1000X (closes:
     #525060)
+  * USB: ftdi_sio: add vendor/product id for the Marvell SheevaPlug.
   * [mipsel/r5k-cobalt] Enable SCSI_SYM53C8XX_2 (closes: #526836).
   * [mips/r4k-ip22] Enable NET_ISA and various ISA network modules on
     the request of Damian Dimmich since they might be useful on the

Added: dists/lenny/linux-2.6/debian/patches/features/all/ftdi_sio-sheevaplug.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/features/all/ftdi_sio-sheevaplug.patch	Sat Jun  6 11:52:44 2009	(r13735)
@@ -0,0 +1,42 @@
+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>
+---
+
+--- a/drivers/usb/serial/ftdi_sio.c	2009-06-06 11:43:12.000000000 +0000
++++ b/drivers/usb/serial/ftdi_sio.c	2009-06-06 11:45:54.000000000 +0000
+@@ -643,6 +643,8 @@
+ 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+ 	{ USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) },
++	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
++		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+ 	{ },					/* Optional parameter entry */
+ 	{ }					/* Terminating entry */
+ };
+--- a/drivers/usb/serial/ftdi_sio.h	2009-06-06 11:43:16.000000000 +0000
++++ b/drivers/usb/serial/ftdi_sio.h	2009-06-06 11:46:27.000000000 +0000
+@@ -864,6 +864,12 @@
+ #define RATOC_PRODUCT_ID_USB60F	0xb020
+ 
+ /*
++ * Marvell SheevaPlug
++ */
++#define MARVELL_VID            0x9e88
++#define MARVELL_SHEEVAPLUG_PID 0x9e8f
++
++/*
+  *   BmRequestType:  1100 0000b
+  *   bRequest:       FTDI_E2_READ
+  *   wValue:         0
+

Modified: dists/lenny/linux-2.6/debian/patches/series/16
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/16	Sat Jun  6 11:26:23 2009	(r13734)
+++ dists/lenny/linux-2.6/debian/patches/series/16	Sat Jun  6 11:52:44 2009	(r13735)
@@ -6,3 +6,4 @@
 + bugfix/x86/fix-ibm-summit-phys_cpu_present_map.patch
 + features/all/xen/xen-blkfront-add-the-CDROM_GET_CAPABILITY-ioctl.patch
 + features/all/xen/xen-blkfront-make-blkif_ioctl-static.patch
++ features/all/ftdi_sio-sheevaplug.patch