usb patches

5 files changed, 159 insertions, 11 deletions

diff --git a/usb/ftdi_sio-new-microham-device-ids.patch b/usb/ftdi_sio-new-microham-device-ids.patch
new file mode 100644
index 0000000000000..70fce24195279
--- /dev/null
+++ b/usb/ftdi_sio-new-microham-device-ids.patch
@@ -0,0 +1,63 @@
+From ian.abbott@mev.co.uk Mon Feb 27 06:05:55 2006
+Message-ID: <4403072C.6050602@mev.co.uk>
+Date: Mon, 27 Feb 2006 14:05:32 +0000
+From: Ian Abbott <abbotti@mev.co.uk>
+Cc: Greg KH <greg@kroah.com>, ftdi-usb-sio-devel@lists.sourceforge.net, Mike Studer <k6eep@hamsoftware.org>
+Subject: [PATCH 2.6.16-rc5] ftdi_sio: new microHAM device IDs
+
+From: Ian Abbott <abbotti@mev.co.uk>
+
+This patch adds a bunch of new device IDs to the ftdi_sio driver for
+various devices from microHAM using FTDI chips.
+
+Micheal Studer supplied the PID for the USB-Y9 device.  I examined the
+INF file in microHAM's Windows driver package for the USB-KW, USB-YS,
+USB-IC, USB-DB9 and USB-RS232 devices.
+
+Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c |    6 ++++++
+ drivers/usb/serial/ftdi_sio.h |   10 +++++++++-
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+
+--- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c
++++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c
+@@ -469,8 +469,14 @@ static struct usb_device_id id_table_com
+ 	{ USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
+ 	{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_YS_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_IC_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_DB9_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_RS232_PID) },
++	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_Y9_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) },
+ 	{ USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },
+--- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.h
++++ gregkh-2.6/drivers/usb/serial/ftdi_sio.h
+@@ -333,10 +333,18 @@
+ 
+ /*
+  * microHAM product IDs (http://www.microham.com).
+- * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>.
++ * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>
++ * and Mike Studer (K6EEP) <k6eep@hamsoftware.org>.
++ * Ian Abbott <abbotti@mev.co.uk> added a few more from the driver INF file.
+  */
++#define FTDI_MHAM_KW_PID 0xEEE8		/* USB-KW interface */
++#define FTDI_MHAM_YS_PID 0xEEE9		/* USB-YS interface */
+ #define FTDI_MHAM_Y6_PID 0xEEEA		/* USB-Y6 interface */
+ #define FTDI_MHAM_Y8_PID 0xEEEB		/* USB-Y8 interface */
++#define FTDI_MHAM_IC_PID 0xEEEC		/* USB-IC interface */
++#define FTDI_MHAM_DB9_PID 0xEEED	/* USB-DB9 interface */
++#define FTDI_MHAM_RS232_PID 0xEEEE	/* USB-RS232 interface */
++#define FTDI_MHAM_Y9_PID 0xEEEF		/* USB-Y9 interface */
+ 
+ /*
+  * Active Robots product ids.
diff --git a/usb/omninet_debug.patch b/usb/omninet_debug.patch
index 47f3209a1203d..86eb9adfc3f32 100644
--- a/usb/omninet_debug.patch
+++ b/usb/omninet_debug.patch
@@ -1,9 +1,10 @@
  drivers/usb/serial/omninet.c |   10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
 
---- gregkh-2.6.orig/drivers/usb/serial/omninet.c	2006-02-17 18:08:32.000000000 -0800
-+++ gregkh-2.6/drivers/usb/serial/omninet.c	2006-02-21 21:58:02.000000000 -0800
-@@ -204,7 +204,7 @@
+---
+--- gregkh-2.6.orig/drivers/usb/serial/omninet.c
++++ gregkh-2.6/drivers/usb/serial/omninet.c
+@@ -204,7 +204,7 @@ static void omninet_read_bulk_callback (
  	int i;
  	int result;
  
@@ -12,7 +13,7 @@
  
  	if (urb->status) {
  		dbg("%s - nonzero read bulk status received: %d", __FUNCTION__, urb->status);
-@@ -250,7 +250,7 @@
+@@ -250,7 +250,7 @@ static int omninet_write (struct usb_ser
  
  	int			result;
  
@@ -21,7 +22,7 @@
  
  	if (count == 0) {
  		dbg("%s - write request of 0 bytes", __FUNCTION__);
-@@ -302,7 +302,7 @@
+@@ -302,7 +302,7 @@ static int omninet_write_room (struct us
  	if (wport->write_urb_busy)
  		room = wport->bulk_out_size - OMNINET_HEADERLEN;
  
@@ -30,7 +31,7 @@
  
  	return (room);
  }
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ static void omninet_write_bulk_callback 
  /*	struct omninet_header	*header = (struct omninet_header  *) urb->transfer_buffer; */
  	struct usb_serial_port 	*port   = (struct usb_serial_port *) urb->context;
  
@@ -39,7 +40,7 @@
  
  	port->write_urb_busy = 0;
  	if (urb->status) {
-@@ -321,8 +321,6 @@
+@@ -321,8 +321,6 @@ static void omninet_write_bulk_callback 
  	}
  
  	schedule_work(&port->work);
diff --git a/usb/usb-fix-ehci-bios-handshake.patch b/usb/usb-fix-ehci-bios-handshake.patch
new file mode 100644
index 0000000000000..01fac20bda17e
--- /dev/null
+++ b/usb/usb-fix-ehci-bios-handshake.patch
@@ -0,0 +1,46 @@
+From akpm@osdl.org Fri Feb 24 16:53:44 2006
+Message-Id: <200602250053.k1P0rdJH016580@shell0.pdx.osdl.net>
+Subject: USB: fix EHCI BIOS handshake
+To: david-b@pacbell.net, dbrownell@users.sourceforge.net, greg@kroah.com,
+   yazar256@gmail.com, mm-commits@vger.kernel.org
+From: David Brownell <david-b@pacbell.net>
+Date: Fri, 24 Feb 2006 16:55:52 -0800
+
+From: David Brownell <david-b@pacbell.net>
+
+Fix http://bugzilla.kernel.org/show_bug.cgi?id=6128
+
+Finish morphing the "early handoff" version of the EHCI BIOS handshake over
+to match the previous implementation inside the EHCI driver (except that
+now we forcibly disable the SMI).  The version that had been with the PCI
+code was surprisingly full of bugs.
+
+Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
+Cc: <yazar256@gmail.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/usb/host/pci-quirks.c |   11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/host/pci-quirks.c
++++ gregkh-2.6/drivers/usb/host/pci-quirks.c
+@@ -260,12 +260,13 @@ static void __devinit quirk_usb_disable_
+ 						offset + EHCI_USBLEGCTLSTS,
+ 						val | EHCI_USBLEGCTLSTS_SOOE);
+ #endif
+-			}
+ 
+-			/* always say Linux will own the hardware
+-			 * by setting EHCI_USBLEGSUP_OS.
+-			 */
+-			pci_write_config_byte(pdev, offset + 3, 1);
++				/* some systems get upset if this semaphore is
++				 * set for any other reason than forcing a BIOS
++				 * handoff..
++				 */
++				pci_write_config_byte(pdev, offset + 3, 1);
++			}
+ 
+ 			/* if boot firmware now owns EHCI, spin till
+ 			 * it hands it over.
diff --git a/usb/usbhid-add-error-handling.patch b/usb/usbhid-add-error-handling.patch
index 2da84304d379a..987cf224b0ea7 100644
--- a/usb/usbhid-add-error-handling.patch
+++ b/usb/usbhid-add-error-handling.patch
@@ -205,7 +205,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	return 0;
  }
  
-@@ -1785,6 +1885,10 @@ static struct hid_device *usb_hid_config
+@@ -1787,6 +1887,10 @@ static struct hid_device *usb_hid_config
  
  	init_waitqueue_head(&hid->wait);
  
@@ -216,7 +216,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	spin_lock_init(&hid->outlock);
  	spin_lock_init(&hid->ctrllock);
  
-@@ -1853,11 +1957,16 @@ static void hid_disconnect(struct usb_in
+@@ -1855,11 +1959,16 @@ static void hid_disconnect(struct usb_in
  	if (!hid)
  		return;
  
@@ -233,7 +233,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if (hid->claimed & HID_CLAIMED_INPUT)
  		hidinput_disconnect(hid);
  	if (hid->claimed & HID_CLAIMED_HIDDEV)
-@@ -1932,6 +2041,10 @@ static int hid_suspend(struct usb_interf
+@@ -1934,6 +2043,10 @@ static int hid_suspend(struct usb_interf
  {
  	struct hid_device *hid = usb_get_intfdata (intf);
  
@@ -244,7 +244,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	usb_kill_urb(hid->urbin);
  	dev_dbg(&intf->dev, "suspend\n");
  	return 0;
-@@ -1942,10 +2055,8 @@ static int hid_resume(struct usb_interfa
+@@ -1944,10 +2057,8 @@ static int hid_resume(struct usb_interfa
  	struct hid_device *hid = usb_get_intfdata (intf);
  	int status;
  
diff --git a/usb/wisegroup-mp-8866-dual-usb-joypad.patch b/usb/wisegroup-mp-8866-dual-usb-joypad.patch
new file mode 100644
index 0000000000000..e0312c2ce6673
--- /dev/null
+++ b/usb/wisegroup-mp-8866-dual-usb-joypad.patch
@@ -0,0 +1,38 @@
+From mactalla.obair@gmail.com Sat Feb 25 06:52:36 2006
+Message-ID: <ae67fd3f0602250652h195aaf12l887018f166f72d76@mail.gmail.com>
+Date: Sat, 25 Feb 2006 09:52:27 -0500
+From: "Andrew Fuller" <mactalla.obair@gmail.com>
+To: "Greg KH" <greg@kroah.com>
+Subject: USB: Wisegroup MP-8866 Dual USB Joypad
+Cc: "Dmitry Torokhov" <dmitry.torokhov@gmail.com>
+
+This patch is for the Dual USB Joypad [0925:8866] from Wisegroup.  The
+HID_QUIRK_NOGET is necessary for it to respond to input, and the
+HID_QUIRK_MULTI_INPUT is necessary to have two js# nodes appear.
+
+Signed-off-by: Andrew Fuller <mactalla.obair@gmail.com>
+Cc: "Dmitry Torokhov" <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/input/hid-core.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/input/hid-core.c
++++ gregkh-2.6/drivers/usb/input/hid-core.c
+@@ -1407,6 +1407,7 @@ void hid_init_reports(struct hid_device 
+ #define USB_VENDOR_ID_WISEGROUP		0x0925
+ #define USB_DEVICE_ID_1_PHIDGETSERVO_20	0x8101
+ #define USB_DEVICE_ID_4_PHIDGETSERVO_20	0x8104
++#define USB_DEVICE_ID_DUAL_USB_JOYPAD   0x8866
+ 
+ #define USB_VENDOR_ID_CODEMERCS		0x07c0
+ #define USB_DEVICE_ID_CODEMERCS_IOW40	0x1500
+@@ -1577,6 +1578,7 @@ static const struct hid_blacklist {
+ 	{ USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},
+ 	{ USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET },
+ 	{ USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },
++	{ USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
+ 
+ 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE },
+ 	{ USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },