From: Greg Kroah-Hartman Date: Sun, 8 May 2016 13:04:41 +0000 (+0200) Subject: 3.14-stable patches X-Git-Tag: v3.14.69~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=232f3fbc8b36eac6c95db2d6dead8fac6b724a6b;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: usb-serial-cp210x-add-id-for-link-ecu.patch usb-serial-cp210x-add-straizona-focusers-device-ids.patch --- diff --git a/queue-3.14/series b/queue-3.14/series index 93eb87d1c0e..db651f4f545 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -16,3 +16,5 @@ maintainers-remove-asterisk-from-efi-directory-names.patch x86-tsc-read-all-ratio-bits-from-msr_platform_info.patch x86-sysfb_efi-fix-valid-bar-address-range-check.patch acpica-dispatcher-update-thread-id-for-recursive-method-calls.patch +usb-serial-cp210x-add-id-for-link-ecu.patch +usb-serial-cp210x-add-straizona-focusers-device-ids.patch diff --git a/queue-3.14/usb-serial-cp210x-add-id-for-link-ecu.patch b/queue-3.14/usb-serial-cp210x-add-id-for-link-ecu.patch new file mode 100644 index 00000000000..514a70a6004 --- /dev/null +++ b/queue-3.14/usb-serial-cp210x-add-id-for-link-ecu.patch @@ -0,0 +1,32 @@ +From 1d377f4d690637a0121eac8701f84a0aa1e69a69 Mon Sep 17 00:00:00 2001 +From: Mike Manning +Date: Mon, 18 Apr 2016 12:13:23 +0000 +Subject: USB: serial: cp210x: add ID for Link ECU + +From: Mike Manning + +commit 1d377f4d690637a0121eac8701f84a0aa1e69a69 upstream. + +The Link ECU is an aftermarket ECU computer for vehicles that provides +full tuning abilities as well as datalogging and displaying capabilities +via the USB to Serial adapter built into the device. + +Signed-off-by: Mike Manning +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/cp210x.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/cp210x.c ++++ b/drivers/usb/serial/cp210x.c +@@ -140,6 +140,8 @@ static const struct usb_device_id id_tab + { USB_DEVICE(0x10C4, 0xF004) }, /* Elan Digital Systems USBcount50 */ + { USB_DEVICE(0x10C5, 0xEA61) }, /* Silicon Labs MobiData GPRS USB Modem */ + { USB_DEVICE(0x10CE, 0xEA6A) }, /* Silicon Labs MobiData GPRS USB Modem 100EU */ ++ { USB_DEVICE(0x12B8, 0xEC60) }, /* Link G4 ECU */ ++ { USB_DEVICE(0x12B8, 0xEC62) }, /* Link G4+ ECU */ + { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */ + { USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */ + { USB_DEVICE(0x166A, 0x0201) }, /* Clipsal 5500PACA C-Bus Pascal Automation Controller */ diff --git a/queue-3.14/usb-serial-cp210x-add-straizona-focusers-device-ids.patch b/queue-3.14/usb-serial-cp210x-add-straizona-focusers-device-ids.patch new file mode 100644 index 00000000000..1c07585fad8 --- /dev/null +++ b/queue-3.14/usb-serial-cp210x-add-straizona-focusers-device-ids.patch @@ -0,0 +1,37 @@ +From 613ac23a46e10d4d4339febdd534fafadd68e059 Mon Sep 17 00:00:00 2001 +From: Jasem Mutlaq +Date: Tue, 19 Apr 2016 10:38:27 +0300 +Subject: USB: serial: cp210x: add Straizona Focusers device ids + +From: Jasem Mutlaq + +commit 613ac23a46e10d4d4339febdd534fafadd68e059 upstream. + +Adding VID:PID for Straizona Focusers to cp210x driver. + +Signed-off-by: Jasem Mutlaq +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/cp210x.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/cp210x.c ++++ b/drivers/usb/serial/cp210x.c +@@ -108,6 +108,7 @@ static const struct usb_device_id id_tab + { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */ + { USB_DEVICE(0x10C4, 0x8281) }, /* Nanotec Plug & Drive */ + { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesis ETRX2USB */ ++ { USB_DEVICE(0x10C4, 0x82F4) }, /* Starizona MicroTouch */ + { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */ + { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */ + { USB_DEVICE(0x10C4, 0x8382) }, /* Cygnal Integrated Products, Inc. */ +@@ -117,6 +118,7 @@ static const struct usb_device_id id_tab + { USB_DEVICE(0x10C4, 0x8418) }, /* IRZ Automation Teleport SG-10 GSM/GPRS Modem */ + { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */ + { USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */ ++ { USB_DEVICE(0x10C4, 0x84B6) }, /* Starizona Hyperion */ + { USB_DEVICE(0x10C4, 0x85EA) }, /* AC-Services IBUS-IF */ + { USB_DEVICE(0x10C4, 0x85EB) }, /* AC-Services CIS-IBUS */ + { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */