more usb patches

author: Greg Kroah-Hartman <gregkh@suse.de> 2008-05-28 14:33:16 -0700
committer: Greg Kroah-Hartman <gregkh@suse.de> 2008-05-28 14:33:16 -0700
commit: 19d35eee79a8d74e075ca75910915bbe28c9b907 (patch)
tree: 8fcc85229b49cef1deee65492cb9b3fc2e3fea51
parent: 1a1a2310b53e1b54d4a1ea7dd6c0275db450d199 (diff)
download: patches-19d35eee79a8d74e075ca75910915bbe28c9b907.tar.gz
6 files changed, 219 insertions, 1 deletions
diff --git a/driver-core/pnp-add-acpi-modalias-entries.patch b/driver-core/pnp-add-acpi-modalias-entries.patch
new file mode 100644
index 00000000000000..3be3fa8a4e69db
--- /dev/null
+++ b/driver-core/pnp-add-acpi-modalias-entries.patch
@@ -0,0 +1,71 @@
+From kay.sievers@vrfy.org Wed May 28 14:21:22 2008
+From: Kay Sievers <kay.sievers@vrfy.org>
+Date: Wed, 28 May 2008 23:06:47 +0200
+Subject: pnp: add acpi:* modalias entries
+Message-ID: <1212008807.2548.2.camel@linux.site>
+
+
+Along with the non-modalias conformant "pnp:*" aliases, we add "acpi:*"
+entries to PNP drivers, to allow module autoloading by ACPI PNP device
+entries, which export proper modalias information, without any specific
+userspace modprobe mangling.
+
+Cc: Adam Belay <ambx1@neo.rr.com>
+Cc: Thomas Renninger <trenn@suse.de>
+Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ scripts/mod/file2alias.c |   24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
+
+--- a/scripts/mod/file2alias.c
++++ b/scripts/mod/file2alias.c
+@@ -332,11 +332,18 @@ static int do_acpi_entry(const char *fil
+ }
+ 
+ /* looks like: "pnp:dD" */
+-static int do_pnp_entry(const char *filename,
+-			struct pnp_device_id *id, char *alias)
++static void do_pnp_device_entry(void *symval, unsigned long size,
++				struct module *mod)
+ {
+-	sprintf(alias, "pnp:d%s*", id->id);
+-	return 1;
++	const unsigned long id_size = sizeof(struct pnp_device_id);
++	const struct pnp_device_id *id = symval;
++
++	device_id_check(mod->name, "pnp", size, id_size, symval);
++
++	buf_printf(&mod->dev_table_buf,
++		   "MODULE_ALIAS(\"pnp:d%s*\");\n", id->id);
++	buf_printf(&mod->dev_table_buf,
++		   "MODULE_ALIAS(\"acpi*:%s:*\");\n", id->id);
+ }
+ 
+ /* looks like: "pnp:dD" for every device of the card */
+@@ -380,9 +387,12 @@ static void do_pnp_card_entries(void *sy
+ 			}
+ 
+ 			/* add an individual alias for every device entry */
+-			if (!dup)
++			if (!dup) {
+ 				buf_printf(&mod->dev_table_buf,
+ 					   "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
++				buf_printf(&mod->dev_table_buf,
++					   "MODULE_ALIAS(\"acpi*:%s:*\");\n", id);
++			}
+ 		}
+ 	}
+ }
+@@ -689,9 +699,7 @@ void handle_moddevtable(struct module *m
+ 			 sizeof(struct acpi_device_id), "acpi",
+ 			 do_acpi_entry, mod);
+ 	else if (sym_is(symname, "__mod_pnp_device_table"))
+-		do_table(symval, sym->st_size,
+-			 sizeof(struct pnp_device_id), "pnp",
+-			 do_pnp_entry, mod);
++		do_pnp_device_entry(symval, sym->st_size, mod);
+ 	else if (sym_is(symname, "__mod_pnp_card_device_table"))
+ 		do_pnp_card_entries(symval, sym->st_size, mod);
+ 	else if (sym_is(symname, "__mod_pcmcia_device_table"))
diff --git a/series b/series
index 74f4eb3ffb51dc..33647127a7cda5 100644
--- a/series
+++ b/series
@@ -28,7 +28,10 @@ usb.current/usb-ehci-fix-remote-wakeup-regression.patch
 usb.current/usb-ehci-fix-bug-in-iso-scheduling.patch
 usb.current/usb-ehci-fix-performance-regression.patch
 usb.current/usb-usb-storage-unusual_devs-update-for-cypress-atacb.patch
-
+usb.current/usb-fix-m600i-unusual_devs-entry.patch
+usb.current/usb-add-support-for-rokr-w5-in-unusual_devs.h.patch
+usb.current/usb-add-another-scanner-quirk.patch
+usb.current/usb-pl2303-another-product-id.patch
 
 
 #####################################################################
@@ -97,6 +100,8 @@ driver-core/driver-core-remove-device_id_size-define.patch
 
 driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch
 
+driver-core/pnp-add-acpi-modalias-entries.patch
+
 #driver-core/read-dev_name-instead-of-bus_id.patch
 #driver-core/add-device-api-without-20-char-limit.patch
 #driver-core/convert-to-api-without-20-char-limit.patch
@@ -207,3 +212,4 @@ ldp/oms-add-oms-maxp-driver.patch
 #pending/greg-debugobjects-add-timer-specific-object-debugging-code.patch
 #pending/firmware-add-kconfig-and-makefile-to-build-the-firmware-samples.patch
 
+
diff --git a/usb/usb-add-another-scanner-quirk.patch b/usb/usb-add-another-scanner-quirk.patch
new file mode 100644
index 00000000000000..6fe945567f23d8
--- /dev/null
+++ b/usb/usb-add-another-scanner-quirk.patch
@@ -0,0 +1,33 @@
+From rene@exactcode.de  Wed May 28 14:11:06 2008
+From: Ren� Rebe <rene@exactcode.de>
+Date: Tue, 27 May 2008 09:05:46 +0200
+Subject: USB: add another scanner quirk
+To: Alan Stern <stern@rowland.harvard.edu>
+Cc: Greg Kroah-Hartman <gregkh@suse.de>, linux-usb-devel@lists.sourceforge.net, Archivista GmbH <webmaster@archivista.ch>
+Message-ID: <483BB2CA.3020206@exactcode.de>
+
+
+Like the HP53{00,70} scanner other devices of the OEM Avision require
+the USB_QUIRK_STRING_FETCH_255 to correct set a configuration with
+"recent" Linux kernels.
+
+Signed-off-by: Ren� Rebe <rene@exactcode.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/core/quirks.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/usb/core/quirks.c
++++ b/drivers/usb/core/quirks.c
+@@ -47,6 +47,10 @@ static const struct usb_device_id usb_qu
+ 	/* Edirol SD-20 */
+ 	{ USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME },
+ 
++	/* Avision AV600U */
++	{ USB_DEVICE(0x0638, 0x0a13), .driver_info =
++	  USB_QUIRK_STRING_FETCH_255 },
++
+ 	/* M-Systems Flash Disk Pioneers */
+ 	{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
+ 
diff --git a/usb/usb-add-support-for-rokr-w5-in-unusual_devs.h.patch b/usb/usb-add-support-for-rokr-w5-in-unusual_devs.h.patch
new file mode 100644
index 00000000000000..9bb5eea1c55f44
--- /dev/null
+++ b/usb/usb-add-support-for-rokr-w5-in-unusual_devs.h.patch
@@ -0,0 +1,37 @@
+From phil@ipom.com  Wed May 28 14:10:43 2008
+From: Phil Dibowitz <phil@ipom.com>
+Date: Mon, 26 May 2008 21:44:00 +0200
+Subject: USB: Add support for ROKR W5 in unusual_devs.h
+To: gregkh@suse.de, linux-usb@vger.kernel.org, USB Storage List <usb-storage@lists.one-eyed-alien.net>
+Message-ID: <483B1300.7070808@ipom.com>
+
+From: Javier Smaldone <javier@smaldone.com.ar>
+
+This patch adds support for rev 2 of an existing unusual_devs entry
+enabling ROKR W5s to work. Greg, please apply.
+
+From: Javier Smaldone <javier@smaldone.com.ar>
+Signed-off-by: Phil Dibowitz <phil@ipom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/storage/unusual_devs.h |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1714,10 +1714,12 @@ UNUSUAL_DEV(  0x22b8, 0x3010, 0x0001, 0x
+ /*
+  * Patch by Pete Zaitcev <zaitcev@redhat.com>
+  * Report by Mark Patton. Red Hat bz#208928.
++ * Added support for rev 0x0002 (Motorola ROKR W5)
++ * by Javier Smaldone <javier@smaldone.com.ar>
+  */
+-UNUSUAL_DEV(  0x22b8, 0x4810, 0x0001, 0x0001,
++UNUSUAL_DEV(  0x22b8, 0x4810, 0x0001, 0x0002,
+ 		"Motorola",
+-		"RAZR V3i",
++		"RAZR V3i/ROKR W5",
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+ 		US_FL_FIX_CAPACITY),
+ 
diff --git a/usb/usb-fix-m600i-unusual_devs-entry.patch b/usb/usb-fix-m600i-unusual_devs-entry.patch
new file mode 100644
index 00000000000000..c71cb9e07eb14f
--- /dev/null
+++ b/usb/usb-fix-m600i-unusual_devs-entry.patch
@@ -0,0 +1,30 @@
+From phil@ipom.com  Wed May 28 14:10:26 2008
+From: Phil Dibowitz <phil@ipom.com>
+Date: Mon, 26 May 2008 21:33:58 +0200
+Subject: USB: Fix M600i unusual_devs entry
+To: gregkh@suse.de, linux-usb@vger.kernel.org, USB Storage List <usb-storage@lists.one-eyed-alien.net>
+Message-ID: <483B10A6.6020801@ipom.com>
+
+
+It turns out that the unusual_devs entry for the Motorola M600i needs
+another flag. This patch adds it. Thanks to Atte Andr� Jensen
+<atte@ballbreaker.dk>.
+
+Signed-off-by: Phil Dibowitz <phil@ipom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/storage/unusual_devs.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1520,7 +1520,7 @@ UNUSUAL_DEV(  0x0fce, 0xe031, 0x0000, 0x
+ 		"Sony Ericsson",
+ 		"M600i",
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+-		US_FL_FIX_CAPACITY ),
++		US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
+ 
+ /* Reported by Kevin Cernekee <kpc-usbdev@gelato.uiuc.edu>
+  * Tested on hardware version 1.10.
diff --git a/usb/usb-pl2303-another-product-id.patch b/usb/usb-pl2303-another-product-id.patch
new file mode 100644
index 00000000000000..4cbd2b5d1435d6
--- /dev/null
+++ b/usb/usb-pl2303-another-product-id.patch
@@ -0,0 +1,41 @@
+From steve@gnusis.org  Wed May 28 14:12:33 2008
+From: Steve Murphy <steve@gnusis.org>
+Date: Fri, 23 May 2008 23:39:05 +0530
+Subject: USB: pl2303: another product ID
+To: greg@kroah.com
+Message-ID: <48370841.4090008@gnusis.org>
+
+I've just got a USB GPRS/EDGE modem branded Manufacturer Micromax Model
+MMX610U (see http://www.airtel.in/level2_t3data.aspx?path=1/106/179)
+working by adding another product ID to pl2303.  Modem info reports same
+module as  Max Arnold's i.e.SIMCOM SIM600  but  with product ID 0x0612
+(cf Ox0611).
+
+From: Steve Murphy <steve@gnusis.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/pl2303.c |    1 +
+ drivers/usb/serial/pl2303.h |    1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/drivers/usb/serial/pl2303.c
++++ b/drivers/usb/serial/pl2303.c
+@@ -56,6 +56,7 @@ static struct usb_device_id id_table [] 
+ 	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ3) },
+ 	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_PHAROS) },
+ 	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ALDIGA) },
++	{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_MMX) },
+ 	{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
+ 	{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) },
+ 	{ USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },
+--- a/drivers/usb/serial/pl2303.h
++++ b/drivers/usb/serial/pl2303.h
+@@ -14,6 +14,7 @@
+ #define PL2303_PRODUCT_ID_PHAROS	0xaaa0
+ #define PL2303_PRODUCT_ID_RSAQ3		0xaaa2
+ #define PL2303_PRODUCT_ID_ALDIGA	0x0611
++#define PL2303_PRODUCT_ID_MMX		0x0612
+ 
+ #define ATEN_VENDOR_ID		0x0557
+ #define ATEN_VENDOR_ID2		0x0547
author	Greg Kroah-Hartman <gregkh@suse.de>	2008-05-28 14:33:16 -0700
committer	Greg Kroah-Hartman <gregkh@suse.de>	2008-05-28 14:33:16 -0700
commit	19d35eee79a8d74e075ca75910915bbe28c9b907 (patch)
tree	8fcc85229b49cef1deee65492cb9b3fc2e3fea51
parent	1a1a2310b53e1b54d4a1ea7dd6c0275db450d199 (diff)
download	patches-19d35eee79a8d74e075ca75910915bbe28c9b907.tar.gz