From: Greg Kroah-Hartman Date: Sun, 13 Jul 2014 23:22:56 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.4.99~56 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b773e794bc037eb525849257c724e08bcb270fc;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-stable patches added patches: usb-cp210x-add-support-for-corsair-usb-dongle.patch usb-ftdi_sio-add-extra-pid.patch usb-option-add-id-for-telewell-tw-lte-4g-v2.patch --- diff --git a/queue-3.10/series b/queue-3.10/series new file mode 100644 index 00000000000..2ead9dda3e6 --- /dev/null +++ b/queue-3.10/series @@ -0,0 +1,5 @@ +usb-option-add-id-for-telewell-tw-lte-4g-v2.patch +usb-cp210x-add-support-for-corsair-usb-dongle.patch +usb-ftdi_sio-add-extra-pid.patch +usb-serial-ftdi_sio-add-infineon-triboard.patch +parisc-add-serial-ports-of-c8000-1ghz-machine-to-hardware-database.patch diff --git a/queue-3.14/series b/queue-3.14/series new file mode 100644 index 00000000000..4389775ad18 --- /dev/null +++ b/queue-3.14/series @@ -0,0 +1,8 @@ +usb-option-add-id-for-telewell-tw-lte-4g-v2.patch +usb-cp210x-add-support-for-corsair-usb-dongle.patch +usb-ftdi_sio-add-extra-pid.patch +usb-serial-ftdi_sio-add-infineon-triboard.patch +iio-ti_am335x_adc-fix-use-same-step-id-at-fifos-both-ends.patch +parisc-add-serial-ports-of-c8000-1ghz-machine-to-hardware-database.patch +parisc-fix-fanotify_mark-syscall-on-32bit-compat-kernel.patch +parisc-metag-do-not-hardcode-maximum-userspace-stack-size.patch diff --git a/queue-3.15/series b/queue-3.15/series new file mode 100644 index 00000000000..1f6607f2bde --- /dev/null +++ b/queue-3.15/series @@ -0,0 +1,9 @@ +usb-option-add-id-for-telewell-tw-lte-4g-v2.patch +usb-cp210x-add-support-for-corsair-usb-dongle.patch +usb-ftdi_sio-add-extra-pid.patch +usb-serial-ftdi_sio-add-infineon-triboard.patch +iio-ti_am335x_adc-fix-use-same-step-id-at-fifos-both-ends.patch +serial-test-for-no-tx-data-on-tx-restart.patch +parisc-add-serial-ports-of-c8000-1ghz-machine-to-hardware-database.patch +parisc-fix-fanotify_mark-syscall-on-32bit-compat-kernel.patch +cgroup-fix-mount-failure-in-a-corner-case.patch diff --git a/queue-3.4/series b/queue-3.4/series new file mode 100644 index 00000000000..d6d805918e6 --- /dev/null +++ b/queue-3.4/series @@ -0,0 +1,3 @@ +usb-option-add-id-for-telewell-tw-lte-4g-v2.patch +usb-cp210x-add-support-for-corsair-usb-dongle.patch +usb-ftdi_sio-add-extra-pid.patch diff --git a/queue-3.4/usb-cp210x-add-support-for-corsair-usb-dongle.patch b/queue-3.4/usb-cp210x-add-support-for-corsair-usb-dongle.patch new file mode 100644 index 00000000000..b0e4d75daa7 --- /dev/null +++ b/queue-3.4/usb-cp210x-add-support-for-corsair-usb-dongle.patch @@ -0,0 +1,34 @@ +From b9326057a3d8447f5d2e74a7b521ccf21add2ec0 Mon Sep 17 00:00:00 2001 +From: Andras Kovacs +Date: Fri, 27 Jun 2014 14:50:11 +0200 +Subject: USB: cp210x: add support for Corsair usb dongle + +From: Andras Kovacs + +commit b9326057a3d8447f5d2e74a7b521ccf21add2ec0 upstream. + +Corsair USB Dongles are shipped with Corsair AXi series PSUs. +These are cp210x serial usb devices, so make driver detect these. +I have a program, that can get information from these PSUs. + +Tested with 2 different dongles shipped with Corsair AX860i and +AX1200i units. + +Signed-off-by: Andras Kovacs +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/cp210x.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/cp210x.c ++++ b/drivers/usb/serial/cp210x.c +@@ -159,6 +159,7 @@ static const struct usb_device_id id_tab + { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */ + { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ + { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ ++ { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */ + { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */ + { USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */ + { USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */ diff --git a/queue-3.4/usb-ftdi_sio-add-extra-pid.patch b/queue-3.4/usb-ftdi_sio-add-extra-pid.patch new file mode 100644 index 00000000000..6771f41498e --- /dev/null +++ b/queue-3.4/usb-ftdi_sio-add-extra-pid.patch @@ -0,0 +1,45 @@ +From 5a7fbe7e9ea0b1b9d7ffdba64db1faa3a259164c Mon Sep 17 00:00:00 2001 +From: Bert Vermeulen +Date: Tue, 8 Jul 2014 14:42:23 +0200 +Subject: USB: ftdi_sio: Add extra PID. + +From: Bert Vermeulen + +commit 5a7fbe7e9ea0b1b9d7ffdba64db1faa3a259164c upstream. + +This patch adds PID 0x0003 to the VID 0x128d (Testo). At least the +Testo 435-4 uses this, likely other gear as well. + +Signed-off-by: Bert Vermeulen +Cc: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ftdi_sio.c | 3 ++- + drivers/usb/serial/ftdi_sio_ids.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -731,7 +731,8 @@ static struct usb_device_id id_table_com + { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) }, +- { USB_DEVICE(TESTO_VID, TESTO_USB_INTERFACE_PID) }, ++ { USB_DEVICE(TESTO_VID, TESTO_1_PID) }, ++ { USB_DEVICE(TESTO_VID, TESTO_3_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_GAMMA_SCOUT_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_TACTRIX_OPENPORT_13M_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_TACTRIX_OPENPORT_13S_PID) }, +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -798,7 +798,8 @@ + * Submitted by Colin Leroy + */ + #define TESTO_VID 0x128D +-#define TESTO_USB_INTERFACE_PID 0x0001 ++#define TESTO_1_PID 0x0001 ++#define TESTO_3_PID 0x0003 + + /* + * Mobility Electronics products. diff --git a/queue-3.4/usb-option-add-id-for-telewell-tw-lte-4g-v2.patch b/queue-3.4/usb-option-add-id-for-telewell-tw-lte-4g-v2.patch new file mode 100644 index 00000000000..5faa7afd330 --- /dev/null +++ b/queue-3.4/usb-option-add-id-for-telewell-tw-lte-4g-v2.patch @@ -0,0 +1,31 @@ +From 3d28bd840b2d3981cd28caf5fe1df38f1344dd60 Mon Sep 17 00:00:00 2001 +From: Bernd Wachter +Date: Wed, 2 Jul 2014 12:36:48 +0300 +Subject: usb: option: Add ID for Telewell TW-LTE 4G v2 + +From: Bernd Wachter + +commit 3d28bd840b2d3981cd28caf5fe1df38f1344dd60 upstream. + +Add ID of the Telewell 4G v2 hardware to option driver to get legacy +serial interface working + +Signed-off-by: Bernd Wachter +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -1501,6 +1501,8 @@ static const struct usb_device_id option + .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1426, 0xff, 0xff, 0xff), /* ZTE MF91 */ + .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1428, 0xff, 0xff, 0xff), /* Telewell TW-LTE 4G v2 */ ++ .driver_info = (kernel_ulong_t)&net_intf2_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1533, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1534, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1535, 0xff, 0xff, 0xff) },