|
@@ -771,6 +771,7 @@ static const struct usb_device_id products[] = {
|
|
|
{QMI_GOBI_DEVICE(0x05c6, 0x9245)}, /* Samsung Gobi 2000 Modem device (VL176) */
|
|
|
{QMI_GOBI_DEVICE(0x03f0, 0x251d)}, /* HP Gobi 2000 Modem device (VP412) */
|
|
|
{QMI_GOBI_DEVICE(0x05c6, 0x9215)}, /* Acer Gobi 2000 Modem device (VP413) */
|
|
|
+ {QMI_FIXED_INTF(0x05c6, 0x9215, 4)}, /* Quectel EC20 Mini PCIe */
|
|
|
{QMI_GOBI_DEVICE(0x05c6, 0x9265)}, /* Asus Gobi 2000 Modem device (VR305) */
|
|
|
{QMI_GOBI_DEVICE(0x05c6, 0x9235)}, /* Top Global Gobi 2000 Modem device (VR306) */
|
|
|
{QMI_GOBI_DEVICE(0x05c6, 0x9275)}, /* iRex Technologies Gobi 2000 Modem device (VR307) */
|
|
@@ -802,10 +803,24 @@ static const struct usb_device_id products[] = {
|
|
|
};
|
|
|
MODULE_DEVICE_TABLE(usb, products);
|
|
|
|
|
|
+static bool quectel_ec20_detected(struct usb_interface *intf)
|
|
|
+{
|
|
|
+ struct usb_device *dev = interface_to_usbdev(intf);
|
|
|
+
|
|
|
+ if (dev->actconfig &&
|
|
|
+ le16_to_cpu(dev->descriptor.idVendor) == 0x05c6 &&
|
|
|
+ le16_to_cpu(dev->descriptor.idProduct) == 0x9215 &&
|
|
|
+ dev->actconfig->desc.bNumInterfaces == 5)
|
|
|
+ return true;
|
|
|
+
|
|
|
+ return false;
|
|
|
+}
|
|
|
+
|
|
|
static int qmi_wwan_probe(struct usb_interface *intf,
|
|
|
const struct usb_device_id *prod)
|
|
|
{
|
|
|
struct usb_device_id *id = (struct usb_device_id *)prod;
|
|
|
+ struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc;
|
|
|
|
|
|
/* Workaround to enable dynamic IDs. This disables usbnet
|
|
|
* blacklisting functionality. Which, if required, can be
|
|
@@ -817,6 +832,12 @@ static int qmi_wwan_probe(struct usb_interface *intf,
|
|
|
id->driver_info = (unsigned long)&qmi_wwan_info;
|
|
|
}
|
|
|
|
|
|
+ /* Quectel EC20 quirk where we've QMI on interface 4 instead of 0 */
|
|
|
+ if (quectel_ec20_detected(intf) && desc->bInterfaceNumber == 0) {
|
|
|
+ dev_dbg(&intf->dev, "Quectel EC20 quirk, skipping interface 0\n");
|
|
|
+ return -ENODEV;
|
|
|
+ }
|
|
|
+
|
|
|
return usbnet_probe(intf, id);
|
|
|
}
|
|
|
|