diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-03 16:46:21 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-03 16:46:21 -0700 |
| commit | 89134fe5a8355ea76d35fcef39cc46ed566f49ea (patch) | |
| tree | 8971b7735355e3b57e8043c4f38e26c84c3b74a4 | |
| parent | 7871d8d7219a6cf73c1327c44651441c0ef0c751 (diff) | |
| download | longterm-queue-2.6.32-89134fe5a8355ea76d35fcef39cc46ed566f49ea.tar.gz | |
.32 patches
3 files changed, 71 insertions, 0 deletions
diff --git a/queue-2.6.32/series b/queue-2.6.32/series index bd7c10d..0dd1c22 100644 --- a/queue-2.6.32/series +++ b/queue-2.6.32/series @@ -107,3 +107,5 @@ net_sched-fix-qdisc_notify.patch ext4-fix-bug_on-in-ext4_ext_insert_extent.patch drivers-net-rionet.c-fix-ethernet-address-macros-for-le-platforms.patch ext2-ext3-ext4-don-t-inherit-append_fl-or-immutable_fl-for-new-inodes.patch +usb-serial-add-device-id-for-sierra-wireless-mc8305.patch +usb-serial-add-pid-0xf7c0-to-ftdi-sio-driver-for-a-zeitcontrol-device.patch diff --git a/queue-2.6.32/usb-serial-add-device-id-for-sierra-wireless-mc8305.patch b/queue-2.6.32/usb-serial-add-device-id-for-sierra-wireless-mc8305.patch new file mode 100644 index 0000000..042031d --- /dev/null +++ b/queue-2.6.32/usb-serial-add-device-id-for-sierra-wireless-mc8305.patch @@ -0,0 +1,28 @@ +From 2f1def2695c223b2aa325e5e47d0d64200a45d23 Mon Sep 17 00:00:00 2001 +From: Florian Echtler <floe@butterbrot.org> +Date: Tue, 9 Aug 2011 13:37:49 +0200 +Subject: USB: Serial: Add device ID for Sierra Wireless MC8305 + +From: Florian Echtler <floe@butterbrot.org> + +commit 2f1def2695c223b2aa325e5e47d0d64200a45d23 upstream. + +A new device ID pair is added for Sierra Wireless MC8305. + +Signed-off-by: Florian Echtler <floe@butterbrot.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/qcserial.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/qcserial.c ++++ b/drivers/usb/serial/qcserial.c +@@ -76,6 +76,7 @@ static struct usb_device_id id_table[] = + {USB_DEVICE(0x1199, 0x9008)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x9009)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ + {USB_DEVICE(0x1199, 0x900a)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ ++ {USB_DEVICE(0x1199, 0x9011)}, /* Sierra Wireless Gobi 2000 Modem device (MC8305) */ + {USB_DEVICE(0x16d8, 0x8001)}, /* CMDTech Gobi 2000 QDL device (VU922) */ + {USB_DEVICE(0x16d8, 0x8002)}, /* CMDTech Gobi 2000 Modem device (VU922) */ + { } /* Terminating entry */ diff --git a/queue-2.6.32/usb-serial-add-pid-0xf7c0-to-ftdi-sio-driver-for-a-zeitcontrol-device.patch b/queue-2.6.32/usb-serial-add-pid-0xf7c0-to-ftdi-sio-driver-for-a-zeitcontrol-device.patch new file mode 100644 index 0000000..41f3c73 --- /dev/null +++ b/queue-2.6.32/usb-serial-add-pid-0xf7c0-to-ftdi-sio-driver-for-a-zeitcontrol-device.patch @@ -0,0 +1,41 @@ +From ce7e9065958191e6b7ca49d7ed0e1099c486d198 Mon Sep 17 00:00:00 2001 +From: Artur Zimmer <artur128@3dzimmer.de> +Date: Wed, 10 Aug 2011 03:51:28 +0200 +Subject: USB: Serial: Add PID(0xF7C0) to FTDI SIO driver for a zeitcontrol-device + +From: Artur Zimmer <artur128@3dzimmer.de> + +commit ce7e9065958191e6b7ca49d7ed0e1099c486d198 upstream. + +Here is a patch for a new PID (zeitcontrol-device mifare-reader FT232BL(like FT232BM but lead free)). + +Signed-off-by: Artur Zimmer <artur128@3dzimmer.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio_ids.h | 6 +++++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -160,6 +160,7 @@ static struct ftdi_sio_quirk ftdi_8u2232 + * /sys/bus/usb/ftdi_sio/new_id, then send patch/report! + */ + static struct usb_device_id id_table_combined [] = { ++ { USB_DEVICE(FTDI_VID, FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CTI_MINI_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_CTI_NANO_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) }, +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -1167,4 +1167,8 @@ + /* USB-Nano-485*/ + #define FTDI_CTI_NANO_PID 0xF60B + +- ++/* ++ * ZeitControl cardsystems GmbH rfid-readers http://zeitconrol.de ++ */ ++/* TagTracer MIFARE*/ ++#define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID 0xF7C0 |