From: Greg Kroah-Hartman Date: Thu, 7 Mar 2019 12:49:10 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v5.0.1~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3c8f71bf70c36c54e70d52075a383854d0dd9e5;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: usb-serial-cp210x-add-id-for-ingenico-3070.patch usb-serial-ftdi_sio-add-id-for-hjelmslund-electronics-usb485.patch usb-serial-option-add-telit-me910-ecm-composition.patch --- diff --git a/queue-4.14/series b/queue-4.14/series index fa8434ccf71..18d42b42be9 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1 +1,4 @@ cpufreq-use-struct-kobj_attribute-instead-of-struct-global_attr.patch +usb-serial-option-add-telit-me910-ecm-composition.patch +usb-serial-cp210x-add-id-for-ingenico-3070.patch +usb-serial-ftdi_sio-add-id-for-hjelmslund-electronics-usb485.patch diff --git a/queue-4.14/usb-serial-cp210x-add-id-for-ingenico-3070.patch b/queue-4.14/usb-serial-cp210x-add-id-for-ingenico-3070.patch new file mode 100644 index 00000000000..020a4a798ae --- /dev/null +++ b/queue-4.14/usb-serial-cp210x-add-id-for-ingenico-3070.patch @@ -0,0 +1,39 @@ +From dd9d3d86b08d6a106830364879c42c78db85389c Mon Sep 17 00:00:00 2001 +From: Ivan Mironov +Date: Wed, 6 Feb 2019 21:14:13 +0500 +Subject: USB: serial: cp210x: add ID for Ingenico 3070 + +From: Ivan Mironov + +commit dd9d3d86b08d6a106830364879c42c78db85389c upstream. + +Here is how this device appears in kernel log: + + usb 3-1: new full-speed USB device number 18 using xhci_hcd + usb 3-1: New USB device found, idVendor=0b00, idProduct=3070 + usb 3-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 + usb 3-1: Product: Ingenico 3070 + usb 3-1: Manufacturer: Silicon Labs + usb 3-1: SerialNumber: 0001 + +Apparently this is a POS terminal with embedded USB-to-Serial converter. + +Cc: stable@vger.kernel.org +Signed-off-by: Ivan Mironov +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 +@@ -64,6 +64,7 @@ static const struct usb_device_id id_tab + { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ + { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ + { USB_DEVICE(0x0908, 0x01FF) }, /* Siemens RUGGEDCOM USB Serial Console */ ++ { USB_DEVICE(0x0B00, 0x3070) }, /* Ingenico 3070 */ + { USB_DEVICE(0x0BED, 0x1100) }, /* MEI (TM) Cashflow-SC Bill/Voucher Acceptor */ + { USB_DEVICE(0x0BED, 0x1101) }, /* MEI series 2000 Combo Acceptor */ + { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */ diff --git a/queue-4.14/usb-serial-ftdi_sio-add-id-for-hjelmslund-electronics-usb485.patch b/queue-4.14/usb-serial-ftdi_sio-add-id-for-hjelmslund-electronics-usb485.patch new file mode 100644 index 00000000000..da806b55dcb --- /dev/null +++ b/queue-4.14/usb-serial-ftdi_sio-add-id-for-hjelmslund-electronics-usb485.patch @@ -0,0 +1,47 @@ +From 8d7fa3d4ea3f0ca69554215e87411494e6346fdc Mon Sep 17 00:00:00 2001 +From: Mans Rullgard +Date: Thu, 14 Feb 2019 19:45:33 +0000 +Subject: USB: serial: ftdi_sio: add ID for Hjelmslund Electronics USB485 + +From: Mans Rullgard + +commit 8d7fa3d4ea3f0ca69554215e87411494e6346fdc upstream. + +This adds the USB ID of the Hjelmslund Electronics USB485 Iso stick. + +Signed-off-by: Mans Rullgard +Cc: stable +Signed-off-by: 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 +@@ -1020,6 +1020,8 @@ static const struct usb_device_id id_tab + { USB_DEVICE(CYPRESS_VID, CYPRESS_WICED_BT_USB_PID) }, + { USB_DEVICE(CYPRESS_VID, CYPRESS_WICED_WL_USB_PID) }, + { USB_DEVICE(AIRBUS_DS_VID, AIRBUS_DS_P8GR) }, ++ /* EZPrototypes devices */ ++ { USB_DEVICE(EZPROTOTYPES_VID, HJELMSLUND_USB485_ISO_PID) }, + { } /* Terminating entry */ + }; + +--- a/drivers/usb/serial/ftdi_sio_ids.h ++++ b/drivers/usb/serial/ftdi_sio_ids.h +@@ -1309,6 +1309,12 @@ + #define IONICS_PLUGCOMPUTER_PID 0x0102 + + /* ++ * EZPrototypes (PID reseller) ++ */ ++#define EZPROTOTYPES_VID 0x1c40 ++#define HJELMSLUND_USB485_ISO_PID 0x0477 ++ ++/* + * Dresden Elektronik Sensor Terminal Board + */ + #define DE_VID 0x1cf1 /* Vendor ID */ diff --git a/queue-4.14/usb-serial-option-add-telit-me910-ecm-composition.patch b/queue-4.14/usb-serial-option-add-telit-me910-ecm-composition.patch new file mode 100644 index 00000000000..b575543646b --- /dev/null +++ b/queue-4.14/usb-serial-option-add-telit-me910-ecm-composition.patch @@ -0,0 +1,31 @@ +From 6431866b6707d27151be381252d6eef13025cfce Mon Sep 17 00:00:00 2001 +From: Daniele Palmas +Date: Wed, 20 Feb 2019 11:43:17 +0100 +Subject: USB: serial: option: add Telit ME910 ECM composition + +From: Daniele Palmas + +commit 6431866b6707d27151be381252d6eef13025cfce upstream. + +This patch adds Telit ME910 family ECM composition 0x1102. + +Signed-off-by: Daniele Palmas +Cc: stable +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 +@@ -1151,6 +1151,8 @@ static const struct usb_device_id option + .driver_info = NCTRL(0) | RSVD(1) | RSVD(3) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM), + .driver_info = NCTRL(0) | RSVD(3) }, ++ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1102, 0xff), /* Telit ME910 (ECM) */ ++ .driver_info = NCTRL(0) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910), + .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910_USBCFG4),