From: Greg Kroah-Hartman Date: Sun, 13 Jul 2014 23:23:09 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v3.4.99~55 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af511c5e27df521971a76f093adaf0ae787347e6;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: parisc-add-serial-ports-of-c8000-1ghz-machine-to-hardware-database.patch 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 usb-serial-ftdi_sio-add-infineon-triboard.patch --- diff --git a/queue-3.10/parisc-add-serial-ports-of-c8000-1ghz-machine-to-hardware-database.patch b/queue-3.10/parisc-add-serial-ports-of-c8000-1ghz-machine-to-hardware-database.patch new file mode 100644 index 00000000000..3e82c80123c --- /dev/null +++ b/queue-3.10/parisc-add-serial-ports-of-c8000-1ghz-machine-to-hardware-database.patch @@ -0,0 +1,28 @@ +From eadcc7208a2237016be7bdff4551ba7614da85c8 Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Sat, 28 Jun 2014 17:44:51 +0200 +Subject: parisc: add serial ports of C8000/1GHz machine to hardware database + +From: Helge Deller + +commit eadcc7208a2237016be7bdff4551ba7614da85c8 upstream. + +Signed-off-by: Helge Deller +Signed-off-by: Greg Kroah-Hartman + +--- + arch/parisc/kernel/hardware.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/arch/parisc/kernel/hardware.c ++++ b/arch/parisc/kernel/hardware.c +@@ -1205,7 +1205,8 @@ static struct hp_hardware hp_hardware_li + {HPHW_FIO, 0x004, 0x00320, 0x0, "Metheus Frame Buffer"}, + {HPHW_FIO, 0x004, 0x00340, 0x0, "BARCO CX4500 VME Grphx Cnsl"}, + {HPHW_FIO, 0x004, 0x00360, 0x0, "Hughes TOG VME FDDI"}, +- {HPHW_FIO, 0x076, 0x000AD, 0x00, "Crestone Peak RS-232"}, ++ {HPHW_FIO, 0x076, 0x000AD, 0x0, "Crestone Peak Core RS-232"}, ++ {HPHW_FIO, 0x077, 0x000AD, 0x0, "Crestone Peak Fast? Core RS-232"}, + {HPHW_IOA, 0x185, 0x0000B, 0x00, "Java BC Summit Port"}, + {HPHW_IOA, 0x1FF, 0x0000B, 0x00, "Hitachi Ghostview Summit Port"}, + {HPHW_IOA, 0x580, 0x0000B, 0x10, "U2-IOA BC Runway Port"}, diff --git a/queue-3.10/usb-cp210x-add-support-for-corsair-usb-dongle.patch b/queue-3.10/usb-cp210x-add-support-for-corsair-usb-dongle.patch new file mode 100644 index 00000000000..9ac59fcd31a --- /dev/null +++ b/queue-3.10/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 +@@ -153,6 +153,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.10/usb-ftdi_sio-add-extra-pid.patch b/queue-3.10/usb-ftdi_sio-add-extra-pid.patch new file mode 100644 index 00000000000..c3225f698f5 --- /dev/null +++ b/queue-3.10/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 +@@ -723,7 +723,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.10/usb-option-add-id-for-telewell-tw-lte-4g-v2.patch b/queue-3.10/usb-option-add-id-for-telewell-tw-lte-4g-v2.patch new file mode 100644 index 00000000000..c2c32da0e62 --- /dev/null +++ b/queue-3.10/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 +@@ -1487,6 +1487,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) }, diff --git a/queue-3.10/usb-serial-ftdi_sio-add-infineon-triboard.patch b/queue-3.10/usb-serial-ftdi_sio-add-infineon-triboard.patch new file mode 100644 index 00000000000..1a5234ef529 --- /dev/null +++ b/queue-3.10/usb-serial-ftdi_sio-add-infineon-triboard.patch @@ -0,0 +1,50 @@ +From d8279a40e50ad55539780aa617a32a53d7f0953e Mon Sep 17 00:00:00 2001 +From: Michal Sojka +Date: Thu, 10 Jul 2014 14:00:34 +0200 +Subject: USB: serial: ftdi_sio: Add Infineon Triboard + +From: Michal Sojka + +commit d8279a40e50ad55539780aa617a32a53d7f0953e upstream. + +This adds support for Infineon TriBoard TC1798 [1]. Only interface 1 +is used as serial line (see [2], Figure 8-6). + +[1] http://www.infineon.com/cms/de/product/microcontroller/development-tools-software-and-kits/tricore-tm-development-tools-software-and-kits/starterkits-and-evaluation-boards/starter-kit-tc1798/channel.html?channel=db3a304333b8a7ca0133cfa3d73e4268 +[2] http://www.infineon.com/dgdl/TriBoardManual-TC1798-V10.pdf?folderId=db3a304412b407950112b409ae7c0343&fileId=db3a304333b8a7ca0133cfae99fe426a + +Signed-off-by: Michal Sojka +Cc: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ftdi_sio.c | 2 ++ + drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++ + 2 files changed, 8 insertions(+) + +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -948,6 +948,8 @@ static struct usb_device_id id_table_com + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) }, + { USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) }, ++ /* Infineon Devices */ ++ { USB_DEVICE_INTERFACE_NUMBER(INFINEON_VID, INFINEON_TRIBOARD_PID, 1) }, + { }, /* Optional parameter entry */ + { } /* Terminating entry */ + }; +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -584,6 +584,12 @@ + #define RATOC_PRODUCT_ID_USB60F 0xb020 + + /* ++ * Infineon Technologies ++ */ ++#define INFINEON_VID 0x058b ++#define INFINEON_TRIBOARD_PID 0x0028 /* DAS JTAG TriBoard TC1798 V1.0 */ ++ ++/* + * Acton Research Corp. + */ + #define ACTON_VID 0x0647 /* Vendor ID */