From: Greg Kroah-Hartman Date: Sun, 7 Feb 2021 15:37:00 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.4.257~52 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c010e4c4e6e46a27644fd12d7e7a00f0169efebb;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: usb-serial-cp210x-add-new-vid-pid-for-supporting-teraoka-ad2000.patch usb-serial-cp210x-add-pid-vid-for-wsda-200-usb.patch usb-serial-option-adding-support-for-cinterion-mv31.patch --- diff --git a/queue-4.19/usb-serial-cp210x-add-new-vid-pid-for-supporting-teraoka-ad2000.patch b/queue-4.19/usb-serial-cp210x-add-new-vid-pid-for-supporting-teraoka-ad2000.patch new file mode 100644 index 00000000000..ac42eff2983 --- /dev/null +++ b/queue-4.19/usb-serial-cp210x-add-new-vid-pid-for-supporting-teraoka-ad2000.patch @@ -0,0 +1,31 @@ +From 43377df70480f82919032eb09832e9646a8a5efb Mon Sep 17 00:00:00 2001 +From: Chenxin Jin +Date: Wed, 13 Jan 2021 16:59:05 +0800 +Subject: USB: serial: cp210x: add new VID/PID for supporting Teraoka AD2000 + +From: Chenxin Jin + +commit 43377df70480f82919032eb09832e9646a8a5efb upstream. + +Teraoka AD2000 uses the CP210x driver, but the chip VID/PID is +customized with 0988/0578. We need the driver to support the new +VID/PID. + +Signed-off-by: Chenxin Jin +Cc: stable@vger.kernel.org +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 +@@ -61,6 +61,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(0x0988, 0x0578) }, /* Teraoka AD2000 */ + { 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 */ diff --git a/queue-4.19/usb-serial-cp210x-add-pid-vid-for-wsda-200-usb.patch b/queue-4.19/usb-serial-cp210x-add-pid-vid-for-wsda-200-usb.patch new file mode 100644 index 00000000000..07cb76fe385 --- /dev/null +++ b/queue-4.19/usb-serial-cp210x-add-pid-vid-for-wsda-200-usb.patch @@ -0,0 +1,32 @@ +From 3c4f6ecd93442f4376a58b38bb40ee0b8c46e0e6 Mon Sep 17 00:00:00 2001 +From: Pho Tran +Date: Mon, 25 Jan 2021 09:26:54 +0000 +Subject: USB: serial: cp210x: add pid/vid for WSDA-200-USB + +From: Pho Tran + +commit 3c4f6ecd93442f4376a58b38bb40ee0b8c46e0e6 upstream. + +Information pid/vid of WSDA-200-USB, Lord corporation company: +vid: 199b +pid: ba30 + +Signed-off-by: Pho Tran +[ johan: amend comment with product name ] +Cc: stable@vger.kernel.org +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 +@@ -201,6 +201,7 @@ static const struct usb_device_id id_tab + { USB_DEVICE(0x1901, 0x0194) }, /* GE Healthcare Remote Alarm Box */ + { USB_DEVICE(0x1901, 0x0195) }, /* GE B850/B650/B450 CP2104 DP UART interface */ + { USB_DEVICE(0x1901, 0x0196) }, /* GE B850 CP2105 DP UART interface */ ++ { USB_DEVICE(0x199B, 0xBA30) }, /* LORD WSDA-200-USB */ + { USB_DEVICE(0x19CF, 0x3000) }, /* Parrot NMEA GPS Flight Recorder */ + { USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */ + { USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */ diff --git a/queue-4.19/usb-serial-option-adding-support-for-cinterion-mv31.patch b/queue-4.19/usb-serial-option-adding-support-for-cinterion-mv31.patch new file mode 100644 index 00000000000..4a028cca0c4 --- /dev/null +++ b/queue-4.19/usb-serial-option-adding-support-for-cinterion-mv31.patch @@ -0,0 +1,70 @@ +From e478d6029dca9d8462f426aee0d32896ef64f10f Mon Sep 17 00:00:00 2001 +From: Christoph Schemmel +Date: Wed, 27 Jan 2021 20:58:46 +0100 +Subject: USB: serial: option: Adding support for Cinterion MV31 + +From: Christoph Schemmel + +commit e478d6029dca9d8462f426aee0d32896ef64f10f upstream. + +Adding support for Cinterion device MV31 for enumeration with +PID 0x00B3 and 0x00B7. + +usb-devices output for 0x00B3 +T: Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 6 Spd=5000 MxCh= 0 +D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 +P: Vendor=1e2d ProdID=00b3 Rev=04.14 +S: Manufacturer=Cinterion +S: Product=Cinterion PID 0x00B3 USB Mobile Broadband +S: SerialNumber=b3246eed +C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA +I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim +I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim +I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=cdc_wdm +I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option + +usb-devices output for 0x00B7 +T: Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 5 Spd=5000 MxCh= 0 +D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 +P: Vendor=1e2d ProdID=00b7 Rev=04.14 +S: Manufacturer=Cinterion +S: Product=Cinterion PID 0x00B3 USB Mobile Broadband +S: SerialNumber=b3246eed +C: #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=896mA +I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan +I: If#=0x1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option + +Signed-off-by: Christoph Schemmel +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/option.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -425,6 +425,8 @@ static void option_instat_callback(struc + #define CINTERION_PRODUCT_AHXX_2RMNET 0x0084 + #define CINTERION_PRODUCT_AHXX_AUDIO 0x0085 + #define CINTERION_PRODUCT_CLS8 0x00b0 ++#define CINTERION_PRODUCT_MV31_MBIM 0x00b3 ++#define CINTERION_PRODUCT_MV31_RMNET 0x00b7 + + /* Olivetti products */ + #define OLIVETTI_VENDOR_ID 0x0b3c +@@ -1914,6 +1916,10 @@ static const struct usb_device_id option + { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDMNET) }, + { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */ + { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) }, ++ { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_MBIM, 0xff), ++ .driver_info = RSVD(3)}, ++ { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_RMNET, 0xff), ++ .driver_info = RSVD(0)}, + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100), + .driver_info = RSVD(4) }, + { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120),