aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-01-11 14:38:03 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-11 14:38:03 -0800
commit9e9a467852dec1d14120c532cc479239984af115 (patch)
tree8941627419e7d8bb61531ff3af103ad53693a42e /usb
parentf16638a13bbf6199377c060237cf04810cd08f73 (diff)
downloadpatches-9e9a467852dec1d14120c532cc479239984af115.tar.gz
more patches
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-ftdi-sio-patch-to-add-vendor-device-id-for-atk_16ic-ccd.patch39
-rw-r--r--usb/usb-ftdi_sio-enabling-multiple-elv-devices-adding-em1010pc.patch94
-rw-r--r--usb/usb-ftdi_sio-support-for-more-jtag-adaptors.patch8
-rw-r--r--usb/usb-use-gfp_noio-in-reset-path.patch30
4 files changed, 167 insertions, 4 deletions
diff --git a/usb/usb-ftdi-sio-patch-to-add-vendor-device-id-for-atk_16ic-ccd.patch b/usb/usb-ftdi-sio-patch-to-add-vendor-device-id-for-atk_16ic-ccd.patch
new file mode 100644
index 00000000000000..317c2de7f73ca5
--- /dev/null
+++ b/usb/usb-ftdi-sio-patch-to-add-vendor-device-id-for-atk_16ic-ccd.patch
@@ -0,0 +1,39 @@
+From nextime@nexlab.it Fri Jan 11 14:27:44 2008
+From: Franco Lanza <nextime@nexlab.it>
+Date: Wed, 26 Dec 2007 03:29:33 +0100
+Subject: USB: ftdi-sio: Patch to add vendor/device id for ATK_16IC CCD
+To: linux-usb-devel@lists.sourceforge.net
+Message-ID: <20071226022933.GA10652@dedalo.nexlab.it>
+
+
+little patches only to add vendor/device id of ATK_16IC CCD cam for
+astronomy.
+
+From: Franco Lanza <nextime@nexlab.it>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c | 1 +
+ drivers/usb/serial/ftdi_sio.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -543,6 +543,7 @@ static struct usb_device_id id_table_com
+ { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HR_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16HRC_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16IC_PID) },
+ { USB_DEVICE(KOBIL_VID, KOBIL_CONV_B1_PID) },
+ { USB_DEVICE(KOBIL_VID, KOBIL_CONV_KAAN_PID) },
+ { USB_DEVICE(POSIFLEX_VID, POSIFLEX_PP7000_PID) },
+--- a/drivers/usb/serial/ftdi_sio.h
++++ b/drivers/usb/serial/ftdi_sio.h
+@@ -279,6 +279,7 @@
+ #define FTDI_ATIK_ATK16C_PID 0xDF32 /* ATIK ATK-16C Colour Camera */
+ #define FTDI_ATIK_ATK16HR_PID 0xDF31 /* ATIK ATK-16HR Grayscale Camera */
+ #define FTDI_ATIK_ATK16HRC_PID 0xDF33 /* ATIK ATK-16HRC Colour Camera */
++#define FTDI_ATIK_ATK16IC_PID 0xDF35 /* ATIK ATK-16IC Grayscale Camera */
+
+ /*
+ * Protego product ids
diff --git a/usb/usb-ftdi_sio-enabling-multiple-elv-devices-adding-em1010pc.patch b/usb/usb-ftdi_sio-enabling-multiple-elv-devices-adding-em1010pc.patch
new file mode 100644
index 00000000000000..2809912d414509
--- /dev/null
+++ b/usb/usb-ftdi_sio-enabling-multiple-elv-devices-adding-em1010pc.patch
@@ -0,0 +1,94 @@
+From Peter.Stark@t-online.de Fri Jan 11 14:24:06 2008
+From: Peter Stark <Peter.Stark@t-online.de>
+Date: Tue, 25 Dec 2007 18:32:08 +0100
+Subject: USB: ftdi_sio - enabling multiple ELV devices, adding EM1010PC
+To: Greg KH <gregkh@suse.de>
+Cc: linux-kernel@vger.kernel.org, linux-usb-users@lists.sourceforge.net, linux-usb-devel@lists.sourceforge.net
+Message-ID: <47713E98.6010809@t-online.de>
+
+
+I work with a group of people on a free home automation tool called
+FHEM. Some of the users own more than one USB-serial device by ELV. The
+ftdi_sio driver has most of the ELV devices disabled by default and
+needs to be re-enabled every time you get a new kernel. Additionally a
+new device (EM 1010 PC - enegry monitor) is missing in the list.
+Currently our users have to follow the instructions we provide at
+http://www.koeniglich.de/fhem/linux.html ... However, to some users it
+is too complicated to compile their own kernel module.
+
+We are aware that you can specify one additional device using the
+vendor/product option of the module. But lot's of users own more than
+one device.
+
+Signed-off-by: Peter Stark <peter.stark@t-online.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c | 44 ++++++++++++++++++++----------------------
+ drivers/usb/serial/ftdi_sio.h | 1
+ 2 files changed, 22 insertions(+), 23 deletions(-)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -471,30 +471,28 @@ static struct usb_device_id id_table_com
+ { USB_DEVICE(FTDI_VID, FTDI_IBS_PEDO_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_IBS_PROD_PID) },
+ /*
+- * These will probably use user-space drivers. Uncomment them if
+- * you need them or use the user-specified vendor/product module
+- * parameters (see ftdi_sio.h for the numbers). Make a fuss if
+- * you think the driver should recognize any of them by default.
++ * Due to many user requests for multiple ELV devices we enable
++ * them by default.
+ */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_CLI7000_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_PPS7330_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_TFM100_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_UDF77_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_UIO88_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_UAD8_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_UDA7_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_USI2_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_T1100_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_PCD200_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_ULA200_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_CSI8_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_EM1000DL_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_PCK100_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_RFP500_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_FS20SIG_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_WS300PC_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_FHZ1300PC_PID) }, */
+- /* { USB_DEVICE(FTDI_VID, FTDI_ELV_WS500_PID) }, */
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_CLI7000_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_PPS7330_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_TFM100_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_UDF77_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_UIO88_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_UAD8_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_UDA7_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_USI2_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_T1100_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_PCD200_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_ULA200_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_CSI8_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_EM1000DL_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_PCK100_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_RFP500_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_FS20SIG_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_WS300PC_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_FHZ1300PC_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_ELV_WS500_PID) },
+ { USB_DEVICE(FTDI_VID, LINX_SDMUSBQSS_PID) },
+ { USB_DEVICE(FTDI_VID, LINX_MASTERDEVEL2_PID) },
+ { USB_DEVICE(FTDI_VID, LINX_FUTURE_0_PID) },
+--- a/drivers/usb/serial/ftdi_sio.h
++++ b/drivers/usb/serial/ftdi_sio.h
+@@ -245,6 +245,7 @@
+ #define FTDI_ELV_WS300PC_PID 0xE0F6 /* PC-Wetterstation (WS 300 PC) */
+ #define FTDI_ELV_FHZ1300PC_PID 0xE0E8 /* FHZ 1300 PC */
+ #define FTDI_ELV_WS500_PID 0xE0E9 /* PC-Wetterstation (WS 500) */
++#define FTDI_ELV_EM1010PC_PID 0xE0EF /* Engery monitor EM 1010 PC */
+
+ /*
+ * Definitions for ID TECH (www.idt-net.com) devices
diff --git a/usb/usb-ftdi_sio-support-for-more-jtag-adaptors.patch b/usb/usb-ftdi_sio-support-for-more-jtag-adaptors.patch
index 169d5b16df112c..d9a5afa06a1002 100644
--- a/usb/usb-ftdi_sio-support-for-more-jtag-adaptors.patch
+++ b/usb/usb-ftdi_sio-support-for-more-jtag-adaptors.patch
@@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
};
static struct ftdi_sio_quirk ftdi_USB_UIRT_quirk = {
-@@ -570,7 +570,11 @@ static struct usb_device_id id_table_com
+@@ -569,7 +569,11 @@ static struct usb_device_id id_table_com
{ USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },
{ USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
{ USB_DEVICE(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID),
@@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};
-@@ -1283,10 +1287,11 @@ static void ftdi_HE_TIRA1_setup (struct
+@@ -1282,10 +1286,11 @@ static void ftdi_HE_TIRA1_setup (struct
} /* ftdi_HE_TIRA1_setup */
/*
@@ -72,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
{
struct usb_device *udev = serial->dev;
struct usb_interface *interface = serial->interface;
-@@ -1294,7 +1299,7 @@ static int ftdi_olimex_probe(struct usb_
+@@ -1293,7 +1298,7 @@ static int ftdi_olimex_probe(struct usb_
dbg("%s",__FUNCTION__);
if (interface == udev->actconfig->interface[0]) {
@@ -94,7 +94,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* Interbiometrics USB I/O Board */
/* Developed for Interbiometrics by Rudolf Gugler */
#define INTERBIOMETRICS_VID 0x1209
-@@ -556,6 +560,13 @@
+@@ -558,6 +562,13 @@
/*
diff --git a/usb/usb-use-gfp_noio-in-reset-path.patch b/usb/usb-use-gfp_noio-in-reset-path.patch
new file mode 100644
index 00000000000000..a9c96a6772afb5
--- /dev/null
+++ b/usb/usb-use-gfp_noio-in-reset-path.patch
@@ -0,0 +1,30 @@
+From oliver@neukum.org Fri Jan 11 14:29:28 2008
+From: Oliver Neukum <oliver@neukum.org>
+Date: Thu, 10 Jan 2008 10:31:48 +0100
+Subject: USB: use GFP_NOIO in reset path
+To: greg@kroah.com, linux-usb@vger.kernel.org
+Message-ID: <200801101031.49369.oliver@neukum.org>
+Content-Disposition: inline
+
+this function will run in the context of the scsi error handler thread.
+It must use GFP_NOIO instead of GFP_KERNEL to avoid a possible
+deadlock.
+
+Signed-off-by: Oliver Neukum <oneukum@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/core/hub.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -2946,7 +2946,7 @@ static int config_descriptors_changed(st
+ if (len < le16_to_cpu(udev->config[index].desc.wTotalLength))
+ len = le16_to_cpu(udev->config[index].desc.wTotalLength);
+ }
+- buf = kmalloc (len, GFP_KERNEL);
++ buf = kmalloc(len, GFP_NOIO);
+ if (buf == NULL) {
+ dev_err(&udev->dev, "no mem to re-read configs after reset\n");
+ /* assume the worst */
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 20:31:35 +0000