aboutsummaryrefslogtreecommitdiffstats
path: root/usb.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-09-15 10:31:58 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-09-15 10:31:58 -0700
commita699584ed72f8904b5b671336d04d2fe22706b28 (patch)
tree4605ab557f69164b3770513ac240c37fefe49c50 /usb.current
parent43d2c0bc0e8a31ed5daa1bc90088d7b0f7eb4078 (diff)
downloadpatches-a699584ed72f8904b5b671336d04d2fe22706b28.tar.gz
more patches
Diffstat (limited to 'usb.current')
-rw-r--r--usb.current/usb-fsl_usb2_udc-fix-vdbg-format-string.patch33
-rw-r--r--usb.current/usb-serial-add-siemens-ef81-to-pl-2303-hack-triggers.patch32
-rw-r--r--usb.current/usb-serial-cp2101-add-device-ids.patch45
-rw-r--r--usb.current/usb-serial-ti_usb_3410_5052-obviously-broken-by-firmware-changes.patch36
-rw-r--r--usb.current/usb-unusual_devs-addition-for-rockchip-mp3-player.patch36
5 files changed, 182 insertions, 0 deletions
diff --git a/usb.current/usb-fsl_usb2_udc-fix-vdbg-format-string.patch b/usb.current/usb-fsl_usb2_udc-fix-vdbg-format-string.patch
new file mode 100644
index 00000000000000..4e1fee9243855b
--- /dev/null
+++ b/usb.current/usb-fsl_usb2_udc-fix-vdbg-format-string.patch
@@ -0,0 +1,33 @@
+From jacmet@gmail.com Mon Sep 15 10:11:30 2008
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 8 Sep 2008 10:08:59 +0200
+Subject: USB: fsl_usb2_udc: fix VDBG() format string
+To: david-b@pacbell.net, gregkh@suse.de, leoli@freescale.com, linux-usb@vger.kernel.org
+Cc: Peter Korsgaard <jacmet@sunsite.dk>
+Message-ID: <1220861339-14967-1-git-send-email-jacmet@sunsite.dk>
+
+
+Fixes:
+drivers/usb/gadget/fsl_usb2_udc.c: In function 'dr_controller_setup':
+drivers/usb/gadget/fsl_usb2_udc.c:229: warning: format '%p' expects type
+'void *', but argument 3 has type 'int'
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/usb/gadget/fsl_usb2_udc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/gadget/fsl_usb2_udc.c
++++ b/drivers/usb/gadget/fsl_usb2_udc.c
+@@ -223,7 +223,7 @@ static int dr_controller_setup(struct fs
+ fsl_writel(tmp, &dr_regs->endpointlistaddr);
+
+ VDBG("vir[qh_base] is %p phy[qh_base] is 0x%8x reg is 0x%8x",
+- (int)udc->ep_qh, (int)tmp,
++ udc->ep_qh, (int)tmp,
+ fsl_readl(&dr_regs->endpointlistaddr));
+
+ /* Config PHY interface */
diff --git a/usb.current/usb-serial-add-siemens-ef81-to-pl-2303-hack-triggers.patch b/usb.current/usb-serial-add-siemens-ef81-to-pl-2303-hack-triggers.patch
new file mode 100644
index 00000000000000..a2ba336eb0ed7e
--- /dev/null
+++ b/usb.current/usb-serial-add-siemens-ef81-to-pl-2303-hack-triggers.patch
@@ -0,0 +1,32 @@
+From andreas@infernal.debian.net Mon Sep 15 10:06:04 2008
+From: Andreas Bombe <andreas.bombe@mytum.de>
+Date: Sun, 14 Sep 2008 01:58:55 +0200
+Subject: usb-serial: Add Siemens EF81 to PL-2303 hack triggers
+To: Greg KH <greg@kroah.com>
+Message-ID: <20080913235855.GA6655@infernal.debian.net>
+Content-Disposition: inline
+
+From: Andreas Bombe <aeb@debian.org>
+
+This hardware needs the pl2303 hack in order to work properly :(
+
+Signed-off-by: Andreas Bombe <aeb@debian.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/usb-serial.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/serial/usb-serial.c
++++ b/drivers/usb/serial/usb-serial.c
+@@ -733,7 +733,9 @@ int usb_serial_probe(struct usb_interfac
+ ((le16_to_cpu(dev->descriptor.idVendor) == ATEN_VENDOR_ID) &&
+ (le16_to_cpu(dev->descriptor.idProduct) == ATEN_PRODUCT_ID)) ||
+ ((le16_to_cpu(dev->descriptor.idVendor) == ALCOR_VENDOR_ID) &&
+- (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID))) {
++ (le16_to_cpu(dev->descriptor.idProduct) == ALCOR_PRODUCT_ID)) ||
++ ((le16_to_cpu(dev->descriptor.idVendor) == SIEMENS_VENDOR_ID) &&
++ (le16_to_cpu(dev->descriptor.idProduct) == SIEMENS_PRODUCT_ID_EF81))) {
+ if (interface != dev->actconfig->interface[0]) {
+ /* check out the endpoints of the other interface*/
+ iface_desc = dev->actconfig->interface[0]->cur_altsetting;
diff --git a/usb.current/usb-serial-cp2101-add-device-ids.patch b/usb.current/usb-serial-cp2101-add-device-ids.patch
new file mode 100644
index 00000000000000..0b661a155b5c26
--- /dev/null
+++ b/usb.current/usb-serial-cp2101-add-device-ids.patch
@@ -0,0 +1,45 @@
+From craig@microtron.org.uk Mon Sep 15 10:08:59 2008
+From: Craig Shelley <craig@microtron.org.uk>
+Date: Thu, 4 Sep 2008 21:28:21 +0100
+Subject: USB: SERIAL CP2101 add device IDs
+To: greg@kroah.com
+Cc: linux-usb@vger.kernel.org, Craig Shelley <craig@microtron.org.uk>
+Message-ID: <12205601012085-git-send-email-craig@microtron.org.uk>
+
+
+From: Craig Shelley <craig@microtron.org.uk>
+
+
+Signed-off-by: Craig Shelley <craig@microtron.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/cp2101.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/usb/serial/cp2101.c
++++ b/drivers/usb/serial/cp2101.c
+@@ -72,6 +72,7 @@ static struct usb_device_id id_table []
+ { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */
+ { USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */
+ { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
++ { USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */
+ { USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */
+ { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */
+ { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
+@@ -83,6 +84,7 @@ static struct usb_device_id id_table []
+ { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */
+ { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
+ { USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */
++ { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */
+ { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
+ { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
+ { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
+@@ -93,6 +95,7 @@ static struct usb_device_id id_table []
+ { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
+ { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */
+ { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
++ { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
+ { } /* Terminating Entry */
+ };
+
diff --git a/usb.current/usb-serial-ti_usb_3410_5052-obviously-broken-by-firmware-changes.patch b/usb.current/usb-serial-ti_usb_3410_5052-obviously-broken-by-firmware-changes.patch
new file mode 100644
index 00000000000000..e63b37ce6850d6
--- /dev/null
+++ b/usb.current/usb-serial-ti_usb_3410_5052-obviously-broken-by-firmware-changes.patch
@@ -0,0 +1,36 @@
+From akpm@linux-foundation.org Mon Sep 15 10:12:27 2008
+From: Chris Adams <cmadams@hiwaay.net>
+Date: Wed, 10 Sep 2008 14:11:38 -0700
+Subject: usb serial: ti_usb_3410_5052 obviously broken by firmware changes
+To: mm-commits@vger.kernel.org
+Cc: cmadams@hiwaay.net, greg@kroah.com
+Message-ID: <200809102111.m8ALBco5026392@imap1.linux-foundation.org>
+
+From: Chris Adams <cmadams@hiwaay.net>
+
+While making some other changes to ti_usb_3410_5052, I noticed that the
+changes made to move the firmware loading to a separate function are
+broken (in ti_download_firmware(), status is set to -ENOMEM and never
+changed). This means the driver will never initialize the device
+properly. It looks like status was supposed to get the result of
+ti_do_download().
+
+Signed-off-by: Chris Adams <cmadams@hiwaay.net>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ti_usb_3410_5052.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/serial/ti_usb_3410_5052.c
++++ b/drivers/usb/serial/ti_usb_3410_5052.c
+@@ -1744,7 +1744,7 @@ static int ti_download_firmware(struct t
+ if (buffer) {
+ memcpy(buffer, fw_p->data, fw_p->size);
+ memset(buffer + fw_p->size, 0xff, buffer_size - fw_p->size);
+- ti_do_download(dev, pipe, buffer, fw_p->size);
++ status = ti_do_download(dev, pipe, buffer, fw_p->size);
+ kfree(buffer);
+ }
+ release_firmware(fw_p);
diff --git a/usb.current/usb-unusual_devs-addition-for-rockchip-mp3-player.patch b/usb.current/usb-unusual_devs-addition-for-rockchip-mp3-player.patch
new file mode 100644
index 00000000000000..712beef5c6e5e1
--- /dev/null
+++ b/usb.current/usb-unusual_devs-addition-for-rockchip-mp3-player.patch
@@ -0,0 +1,36 @@
+From stern+48acf28e@rowland.harvard.edu Mon Sep 15 10:09:28 2008
+From: Alan Stern <stern@rowland.harvard.edu>
+Date: Thu, 4 Sep 2008 09:56:35 -0400 (EDT)
+Subject: USB: unusual_devs addition for RockChip MP3 player
+To: Greg KH <greg@kroah.com>, Phil Dibowitz <phil@ipom.com>
+Cc: Adrian Pilchowiec <adi1981@epf.pl>, USB Storage list <usb-storage@lists.one-eyed-alien.net>
+Message-ID: <Pine.LNX.4.44L0.0809040954490.2474-100000@iolanthe.rowland.org>
+
+
+This patch (as1136) adds an unusual_devs entry for a version of the
+RockChip MP3 player which can't handle the MODE SENSE command used for
+write-protect detection.
+
+Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/storage/unusual_devs.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1001,6 +1001,13 @@ UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY ),
+
++/* Reported by Adrian Pilchowiec <adi1981@epf.pl> */
++UNUSUAL_DEV( 0x071b, 0x3203, 0x0000, 0x0000,
++ "RockChip",
++ "MP3",
++ US_SC_DEVICE, US_PR_DEVICE, NULL,
++ US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64),
++
+ /* Reported by Massimiliano Ghilardi <massimiliano.ghilardi@gmail.com>
+ * This USB MP3/AVI player device fails and disconnects if more than 128
+ * sectors (64kB) are read/written in a single command, and may be present