aboutsummaryrefslogtreecommitdiffstats
path: root/usb.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-12-09 21:05:13 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-12-09 21:05:13 -0800
commit94b59b0d314ce1f564847775aa9eab3f22f4952a (patch)
tree605c045968c6b932be4801006f9f02fb63136200 /usb.current
parent1776bf845198ea8886ffbf0b7abc4091cd4202ec (diff)
downloadpatches-94b59b0d314ce1f564847775aa9eab3f22f4952a.tar.gz
lots-o-patches added
Diffstat (limited to 'usb.current')
-rw-r--r--usb.current/tty-sprogii-dcc-controller-identifiers.patch48
-rw-r--r--usb.current/usb-ftdi_sio-adding-ewert-energy-system-s-candapter-pid.patch60
-rw-r--r--usb.current/usb-gadget-fix-rndis-working-at-high-speed.patch45
-rw-r--r--usb.current/usb-storage-unusual_devs.h-nokia-3109c-addition.patch52
-rw-r--r--usb.current/usb-storage-update-unusual_devs-entry-for-nokia-5310.patch34
-rw-r--r--usb.current/usb-unusual-devs-patch-for-nokia-3500c.patch45
6 files changed, 284 insertions, 0 deletions
diff --git a/usb.current/tty-sprogii-dcc-controller-identifiers.patch b/usb.current/tty-sprogii-dcc-controller-identifiers.patch
new file mode 100644
index 00000000000000..cea7f1ce32aa5d
--- /dev/null
+++ b/usb.current/tty-sprogii-dcc-controller-identifiers.patch
@@ -0,0 +1,48 @@
+From akpm@linux-foundation.org Tue Dec 9 20:25:33 2008
+From: Alan Cox <alan@redhat.com>
+Date: Sat, 06 Dec 2008 23:46:04 -0800
+Subject: USB: tty: SprogII DCC controller identifiers
+To: mm-commits@vger.kernel.org
+Cc: alan@redhat.com, greg@kroah.com
+Message-ID: <200812070746.mB77k4wi004488@imap1.linux-foundation.org>
+
+From: Alan Cox <alan@redhat.com>
+
+Someone on rmweb reminded me this had been overlooked from ages ago..
+
+Add the identifiers for the Sprog II USB. This is a DCC control interface
+using the FTDI-SIO hardware: http://www.sprog-dcc.co.uk/. People have been
+using it with insmod options for ages, this just puts it into the driver
+data.
+
+Signed-off-by: Alan Cox <alan@redhat.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c | 1 +
+ drivers/usb/serial/ftdi_sio.h | 3 +++
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -166,6 +166,7 @@ static struct usb_device_id id_table_com
+ { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_PID) },
+ { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) },
+ { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) },
+ { USB_DEVICE(FTDI_VID, FTDI_XF_632_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_XF_634_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_XF_547_PID) },
+--- a/drivers/usb/serial/ftdi_sio.h
++++ b/drivers/usb/serial/ftdi_sio.h
+@@ -75,6 +75,9 @@
+ /* OpenDCC (www.opendcc.de) product id */
+ #define FTDI_OPENDCC_PID 0xBFD8
+
++/* Sprog II (Andrew Crosland's SprogII DCC interface) */
++#define FTDI_SPROG_II 0xF0C8
++
+ /* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */
+ /* they use the ftdi chipset for the USB interface and the vendor id is the same */
+ #define FTDI_XF_632_PID 0xFC08 /* 632: 16x2 Character Display */
diff --git a/usb.current/usb-ftdi_sio-adding-ewert-energy-system-s-candapter-pid.patch b/usb.current/usb-ftdi_sio-adding-ewert-energy-system-s-candapter-pid.patch
new file mode 100644
index 00000000000000..bd3d4ea10f3965
--- /dev/null
+++ b/usb.current/usb-ftdi_sio-adding-ewert-energy-system-s-candapter-pid.patch
@@ -0,0 +1,60 @@
+From andrew@ewertenergy.com Tue Dec 9 20:37:43 2008
+From: Andrew Ewert <andrew@ewertenergy.com>
+Date: Thu, 4 Dec 2008 09:09:59 -0600 (CST)
+Subject: USB: ftdi_sio: Adding Ewert Energy System's CANdapter PID
+To: linux-usb@vger.kernel.org, "Greg KH" <greg@kroah.com>
+Cc: andrew@ewertenergy.com
+Message-ID: <200812041509.mB4F9x4c016788@cslab.wheaton.edu>
+
+From: Andrew Ewert <andrew@ewertenergy.com>
+
+The following patch adds in the USB PID for Ewert Energy System's CANdapter
+device (CANBUS to USB-Serial which uses the FTDI 245R chipset) to the ftdi_sio
+device driver.
+
+The patch was tested successfully on Linux kernel 2.6.27 under Ubuntu.
+
+Relevant output from /proc/bus/usb/devices (With patch installed):
+
+T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 0
+D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1
+P: Vendor=0403 ProdID=9f80 Rev= 6.00
+S: Manufacturer=Ewert Energy Systems
+S: Product=CANdapter
+S: SerialNumber=A6RGB3Z3
+C:* #Ifs= 1 Cfg#= 1 Atr=a0 MxPwr= 90mA
+I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=ftdi_sio
+E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms
+E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms
+
+
+Signed-off-by: Andrew Ewert <andrew@ewertenergy.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c | 1 +
+ drivers/usb/serial/ftdi_sio.h | 3 +++
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -143,6 +143,7 @@ static struct ftdi_sio_quirk ftdi_HE_TIR
+ static struct usb_device_id id_table_combined [] = {
+ { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_0_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_1_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_2_PID) },
+--- a/drivers/usb/serial/ftdi_sio.h
++++ b/drivers/usb/serial/ftdi_sio.h
+@@ -40,6 +40,9 @@
+ /* AlphaMicro Components AMC-232USB01 device */
+ #define FTDI_AMC232_PID 0xFF00 /* Product Id */
+
++/* www.candapter.com Ewert Energy Systems CANdapter device */
++#define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */
++
+ /* SCS HF Radio Modems PID's (http://www.scs-ptc.com) */
+ /* the VID is the standard ftdi vid (FTDI_VID) */
+ #define FTDI_SCS_DEVICE_0_PID 0xD010 /* SCS PTC-IIusb */
diff --git a/usb.current/usb-gadget-fix-rndis-working-at-high-speed.patch b/usb.current/usb-gadget-fix-rndis-working-at-high-speed.patch
new file mode 100644
index 00000000000000..d87e0b018f7a7c
--- /dev/null
+++ b/usb.current/usb-gadget-fix-rndis-working-at-high-speed.patch
@@ -0,0 +1,45 @@
+From david-b@pacbell.net Tue Dec 9 20:40:02 2008
+From: David Brownell <david-b@pacbell.net>
+Date: Mon, 24 Nov 2008 23:11:03 -0800
+Subject: USB: gadget: fix rndis working at high speed
+To: linux-usb@vger.kernel.org
+Cc: Greg KH <greg@kroah.com>
+Message-ID: <200811242311.03524.david-b@pacbell.net>
+Content-Disposition: inline
+
+
+From: David Brownell <dbrownell@users.sourceforge.net>
+
+Fix a bug specific to highspeed mode in the recently updated RNDIS
+support: it wasn't setting up the high speed notification endpoint,
+which prevented high speed RNDIS links from working.
+
+Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
+Tested-by: Anand Gadiyar <gadiyar@ti.com>
+Cc: stable <stable@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/gadget/f_rndis.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/usb/gadget/f_rndis.c
++++ b/drivers/usb/gadget/f_rndis.c
+@@ -651,6 +651,8 @@ rndis_bind(struct usb_configuration *c,
+ fs_in_desc.bEndpointAddress;
+ hs_out_desc.bEndpointAddress =
+ fs_out_desc.bEndpointAddress;
++ hs_notify_desc.bEndpointAddress =
++ fs_notify_desc.bEndpointAddress;
+
+ /* copy descriptors, and track endpoint copies */
+ f->hs_descriptors = usb_copy_descriptors(eth_hs_function);
+@@ -662,6 +664,8 @@ rndis_bind(struct usb_configuration *c,
+ f->hs_descriptors, &hs_in_desc);
+ rndis->hs.out = usb_find_endpoint(eth_hs_function,
+ f->hs_descriptors, &hs_out_desc);
++ rndis->hs.notify = usb_find_endpoint(eth_hs_function,
++ f->hs_descriptors, &hs_notify_desc);
+ }
+
+ rndis->port.open = rndis_open;
diff --git a/usb.current/usb-storage-unusual_devs.h-nokia-3109c-addition.patch b/usb.current/usb-storage-unusual_devs.h-nokia-3109c-addition.patch
new file mode 100644
index 00000000000000..d05235d624106d
--- /dev/null
+++ b/usb.current/usb-storage-unusual_devs.h-nokia-3109c-addition.patch
@@ -0,0 +1,52 @@
+From boobaa@frugalware.org Tue Dec 9 20:14:32 2008
+From: CS�CSY L�szl� <boobaa@frugalware.org>
+Date: Tue, 9 Dec 2008 23:39:14 +0100
+Subject: USB: storage: unusual_devs.h: Nokia 3109c addition
+To: Phil Dibowitz <phil@ipom.com>
+Cc: Alan Stern <stern@rowland.harvard.edu>, USB storage list <usb-storage@lists.one-eyed-alien.net>
+Message-ID: <200812092339.14720.boobaa@frugalware.org>
+
+From: CS�CSY L�szl� <boobaa@frugalware.org>
+
+2.6.26(.x, cannot remember) could handle the microSD card in my Nokia
+3109c attached via USB as mass storage, 2.6.27(.x, up to and included
+2.6.27.8) cannot. Please find the attached patch which fixes this
+regression, and a copy of /proc/bus/usb/devices with my phone plugged in
+running with this patch on Frugalware.
+
+T: Bus=02 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 4 Spd=12 MxCh= 0
+D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
+P: Vendor=0421 ProdID=0063 Rev= 6.01
+S: Manufacturer=Nokia
+S: Product=Nokia 3109c
+S: SerialNumber=359561013742570
+C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=100mA
+I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage
+E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms
+E: Ad=01(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms
+
+From: CS�CSY L�szl� <boobaa@frugalware.org>
+Cc: Phil Dibowitz <phil@ipom.com>
+Cc: stable <stable@kernel.org>
+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
+@@ -167,6 +167,13 @@ UNUSUAL_DEV( 0x0421, 0x005d, 0x0001, 0x
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY ),
+
++/* Reported by CSECSY Laszlo <boobaa@frugalware.org> */
++UNUSUAL_DEV( 0x0421, 0x0063, 0x0001, 0x0601,
++ "Nokia",
++ "Nokia 3109c",
++ US_SC_DEVICE, US_PR_DEVICE, NULL,
++ US_FL_FIX_CAPACITY ),
++
+ /* Patch for Nokia 5310 capacity */
+ UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0591,
+ "Nokia",
diff --git a/usb.current/usb-storage-update-unusual_devs-entry-for-nokia-5310.patch b/usb.current/usb-storage-update-unusual_devs-entry-for-nokia-5310.patch
new file mode 100644
index 00000000000000..8cbd80f6b10115
--- /dev/null
+++ b/usb.current/usb-storage-update-unusual_devs-entry-for-nokia-5310.patch
@@ -0,0 +1,34 @@
+From stern@rowland.harvard.edu Tue Dec 9 20:44:02 2008
+From: Alan Stern <stern@rowland.harvard.edu>
+Date: Mon, 1 Dec 2008 10:23:43 -0500 (EST)
+Subject: usb-storage: update unusual_devs entry for Nokia 5310
+To: Greg KH <greg@kroah.com>, Phil Dibowitz <phil@ipom.com>
+Cc: Robson Roberto Souza Peixoto <robsonpeixoto@gmail.com>, USB Storage list <usb-storage@lists.one-eyed-alien.net>
+Message-ID: <Pine.LNX.4.44L0.0812011022380.2212-100000@iolanthe.rowland.org>
+
+
+This patch (as1179) updates the unusual_devs entry for Nokia's 5310
+phone to include a more recent firmware revision.
+
+This fixes Bugzilla #12099.
+
+Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+Tested-by: Robson Roberto Souza Peixoto <robsonpeixoto@gmail.com>
+Cc: stable <stable@kernel.org>
+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
+@@ -182,7 +182,7 @@ UNUSUAL_DEV( 0x0421, 0x0063, 0x0001, 0x
+ US_FL_FIX_CAPACITY ),
+
+ /* Patch for Nokia 5310 capacity */
+-UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0591,
++UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0701,
+ "Nokia",
+ "5310",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
diff --git a/usb.current/usb-unusual-devs-patch-for-nokia-3500c.patch b/usb.current/usb-unusual-devs-patch-for-nokia-3500c.patch
new file mode 100644
index 00000000000000..348298d46d0881
--- /dev/null
+++ b/usb.current/usb-unusual-devs-patch-for-nokia-3500c.patch
@@ -0,0 +1,45 @@
+From themgzzy@gmail.com Tue Dec 9 20:19:22 2008
+From: Ozan Sener <themgzzy@gmail.com>
+Date: Mon, 8 Dec 2008 19:15:45 +0200
+Subject: USB: Unusual devs patch for Nokia 3500c
+To: stern@rowland.harvard.edu
+Cc: linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net
+Message-ID: <20081208191545.53367e1a@slave.domain.org>
+
+From: Ozan Sener <themgzzy@gmail.com>
+
+T: Bus=02 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 3 Spd=12 MxCh= 0
+D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
+P: Vendor=0421 ProdID=0060 Rev= 5.51
+S: Manufacturer=Nokia
+S: Product=Nokia 3500c
+S: SerialNumber=357687010280751
+C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=100mA
+I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage
+E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms
+E: Ad=01(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms
+
+From: Ozan Sener <themgzzy@gmail.com>
+Cc: stable <stable@kernel.org>
+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
+@@ -167,6 +167,13 @@ UNUSUAL_DEV( 0x0421, 0x005d, 0x0001, 0x
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY ),
+
++/* Reported by Ozan Sener <themgzzy@gmail.com> */
++UNUSUAL_DEV( 0x0421, 0x0060, 0x0551, 0x0551,
++ "Nokia",
++ "3500c",
++ US_SC_DEVICE, US_PR_DEVICE, NULL,
++ US_FL_FIX_CAPACITY ),
++
+ /* Reported by CSECSY Laszlo <boobaa@frugalware.org> */
+ UNUSUAL_DEV( 0x0421, 0x0063, 0x0001, 0x0601,
+ "Nokia",
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 21:00:21 +0000