| From 84f3b43f7378b98b7e3096d5499de75183d4347c Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no> |
| Date: Wed, 27 Mar 2019 15:25:32 +0100 |
| Subject: USB: serial: option: add Olicard 600 |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Bjørn Mork <bjorn@mork.no> |
| |
| commit 84f3b43f7378b98b7e3096d5499de75183d4347c upstream. |
| |
| This is a Qualcomm based device with a QMI function on interface 4. |
| It is mode switched from 2020:2030 using a standard eject message. |
| |
| T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 6 Spd=480 MxCh= 0 |
| D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 |
| P: Vendor=2020 ProdID=2031 Rev= 2.32 |
| S: Manufacturer=Mobile Connect |
| S: Product=Mobile Connect |
| S: SerialNumber=0123456789ABCDEF |
| C:* #Ifs= 6 Cfg#= 1 Atr=80 MxPwr=500mA |
| I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) |
| E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms |
| E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms |
| I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) |
| E: Ad=83(I) Atr=03(Int.) MxPS= 10 Ivl=32ms |
| E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms |
| E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms |
| I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) |
| E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms |
| E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms |
| E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms |
| I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none) |
| E: Ad=87(I) Atr=03(Int.) MxPS= 10 Ivl=32ms |
| E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms |
| E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms |
| I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) |
| E: Ad=89(I) Atr=03(Int.) MxPS= 8 Ivl=32ms |
| E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms |
| E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms |
| I:* If#= 5 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=(none) |
| E: Ad=8a(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms |
| E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=125us |
| |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Bjørn Mork <bjorn@mork.no> |
| [ johan: use tabs to align comments in adjacent lines ] |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/serial/option.c | 10 ++++++---- |
| 1 file changed, 6 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/usb/serial/option.c |
| +++ b/drivers/usb/serial/option.c |
| @@ -1947,10 +1947,12 @@ static const struct usb_device_id option |
| .driver_info = RSVD(4) }, |
| { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff), /* D-Link DWM-222 */ |
| .driver_info = RSVD(4) }, |
| - { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ |
| - { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ |
| - { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */ |
| - { USB_DEVICE_INTERFACE_CLASS(0x2020, 0x4000, 0xff) }, /* OLICARD300 - MT6225 */ |
| + { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ |
| + { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ |
| + { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */ |
| + { USB_DEVICE_INTERFACE_CLASS(0x2020, 0x2031, 0xff), /* Olicard 600 */ |
| + .driver_info = RSVD(4) }, |
| + { USB_DEVICE_INTERFACE_CLASS(0x2020, 0x4000, 0xff) }, /* OLICARD300 - MT6225 */ |
| { USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) }, |
| { USB_DEVICE(VIATELECOM_VENDOR_ID, VIATELECOM_PRODUCT_CDS7) }, |
| { USB_DEVICE_AND_INTERFACE_INFO(WETELECOM_VENDOR_ID, WETELECOM_PRODUCT_WMD200, 0xff, 0xff, 0xff) }, |