add usb patches to queue-2.6.25

diff --git a/queue-2.6.25/series b/queue-2.6.25/series
index 2e77835e4b41307c2f08c619bbc2f0cc77fb1ac0..4f63b68806671bc383b546816c7990dcb32dc996 100644 (file)
--- a/queue-2.6.25/series
+++ b/queue-2.6.25/series
@@ -15,3 +15,5 @@ i2c-max6875-really-prevent-24rf08-corruption.patch
 x86-user_regset_view-table-fix-for-ia32-on-64-bit.patch
 i386-fix-asm-constraint-in-do_irq.patch
 cifs-fix-unc-path-prefix-on-queryunixpathinfo-to-have-correct-slash.patch
+usb-add-telit-hdspa-uc864-e-modem-to-option-driver.patch
+usb-serial-use-ftdi_sio-driver-for-ratoc-rex-usb60f.patch

diff --git a/queue-2.6.25/usb-add-telit-hdspa-uc864-e-modem-to-option-driver.patch b/queue-2.6.25/usb-add-telit-hdspa-uc864-e-modem-to-option-driver.patch
new file mode 100644 (file)
index 0000000..23a281b
--- /dev/null
+++ b/queue-2.6.25/usb-add-telit-hdspa-uc864-e-modem-to-option-driver.patch
@@ -0,0 +1,46 @@
+From stable-bounces@linux.kernel.org  Tue May 20 21:43:10 2008
+Date: Wed, 21 May 2008 02:35:14 GMT
+Message-Id: <200805210235.m4L2ZEsl001236@hera.kernel.org>
+From: jejb@kernel.org
+To: jejb@kernel.org, stable@kernel.org
+Subject: USB: add TELIT HDSPA UC864-E modem to option driver
+
+From: Greg Kroah-Hartman <gregkh@suse.de>
+
+upstream commit: ee53b0ca0153b4f944cb142b5e65c96a1860d765
+
+This adds the Telit UC864-E HDSPA modem support to the option driver.
+This lets their customers comply with the GPL instead of having to use a
+binary driver from the manufacturer.
+
+Cc: Simon Kissel <kissel@viprinet.com>
+Cc: Nico Erfurth <ne@nicoerfurth.de>
+Cc: Andrea Ghezzo <TS-EMEA@telit.com>
+Cc: Dietmar Staps <Dietmar.Staps@telit.com>
+Cc: stable <stable@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ drivers/usb/serial/option.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -193,6 +193,9 @@ static int  option_send_setup(struct usb
+ 
+ #define MAXON_VENDOR_ID                               0x16d8
+ 
++#define TELIT_VENDOR_ID                               0x1bc7
++#define TELIT_PRODUCT_UC864E                  0x1003
++
+ static struct usb_device_id option_ids[] = {
+       { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
+       { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
+@@ -300,6 +303,7 @@ static struct usb_device_id option_ids[]
+       { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
+       { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */
+       { USB_DEVICE(0x19d2, 0x0001) },         /* Telstra NextG CDMA */
++      { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },
+       { } /* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(usb, option_ids);

diff --git a/queue-2.6.25/usb-serial-use-ftdi_sio-driver-for-ratoc-rex-usb60f.patch b/queue-2.6.25/usb-serial-use-ftdi_sio-driver-for-ratoc-rex-usb60f.patch
new file mode 100644 (file)
index 0000000..e1c5eba
--- /dev/null
+++ b/queue-2.6.25/usb-serial-use-ftdi_sio-driver-for-ratoc-rex-usb60f.patch
@@ -0,0 +1,72 @@
+From stable-bounces@linux.kernel.org  Tue May 20 21:43:45 2008
+Date: Wed, 21 May 2008 02:35:17 GMT
+Message-Id: <200805210235.m4L2ZHA8001251@hera.kernel.org>
+From: jejb@kernel.org
+To: jejb@kernel.org, stable@kernel.org
+Subject: usb-serial: Use ftdi_sio driver for RATOC REX-USB60F
+
+From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
+
+upstream commit: 26ab705396b65a469233a8327ecb51b8aebb6be0
+
+This patch reverts 57833ea6b95a3995149f1f6d1a8d8862ab7a0ba2
+("usb-serial: pl2303: add support for RATOC REX-USB60F") and adds
+support for the device to ftdi_sio driver.
+
+Cc: Akira Tsukamoto <akirat@rd.scei.sony.co.jp>
+Cc: stable <stable@kernel.org>
+Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ drivers/usb/serial/ftdi_sio.c |    1 +
+ drivers/usb/serial/ftdi_sio.h |    6 ++++++
+ drivers/usb/serial/pl2303.c   |    1 -
+ drivers/usb/serial/pl2303.h   |    1 -
+ 4 files changed, 7 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -366,6 +366,7 @@ static struct usb_device_id id_table_com
+               .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+       { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID),
+               .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
++      { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
+       { },                                    /* Optional parameter entry */
+       { }                                     /* Terminating entry */
+ };
+--- a/drivers/usb/serial/ftdi_sio.h
++++ b/drivers/usb/serial/ftdi_sio.h
+@@ -581,6 +581,12 @@
+ #define       FIC_NEO1973_DEBUG_PID   0x5118
+ 
+ /*
++ * RATOC REX-USB60F
++ */
++#define RATOC_VENDOR_ID               0x0584
++#define RATOC_PRODUCT_ID_USB60F       0xb020
++
++/*
+  *   BmRequestType:  1100 0000b
+  *   bRequest:       FTDI_E2_READ
+  *   wValue:         0
+--- a/drivers/usb/serial/pl2303.c
++++ b/drivers/usb/serial/pl2303.c
+@@ -66,7 +66,6 @@ static struct usb_device_id id_table [] 
+       { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID_2080) },
+       { USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) },
+       { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) },
+-      { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
+       { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) },
+       { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) },
+       { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) },
+--- a/drivers/usb/serial/pl2303.h
++++ b/drivers/usb/serial/pl2303.h
+@@ -36,7 +36,6 @@
+ 
+ #define RATOC_VENDOR_ID               0x0584
+ #define RATOC_PRODUCT_ID      0xb000
+-#define RATOC_PRODUCT_ID_USB60F       0xb020
+ 
+ #define TRIPP_VENDOR_ID               0x2478
+ #define TRIPP_PRODUCT_ID      0x2008