|
@@ -10,26 +10,52 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
|
|
|
|
|
|
|
--- a/drivers/net/usb/qmi_wwan.c
|
|
--- a/drivers/net/usb/qmi_wwan.c
|
|
|
+++ b/drivers/net/usb/qmi_wwan.c
|
|
+++ b/drivers/net/usb/qmi_wwan.c
|
|
|
-@@ -1086,6 +1086,7 @@ static const struct usb_device_id produc
|
|
|
|
|
|
|
+@@ -1080,12 +1080,18 @@ static const struct usb_device_id produc
|
|
|
|
|
+ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7),
|
|
|
|
|
+ .driver_info = (unsigned long)&qmi_wwan_info,
|
|
|
|
|
+ },
|
|
|
|
|
++ { /* Meiglink SGM828 */
|
|
|
|
|
++ USB_DEVICE_AND_INTERFACE_INFO(0x2dee, 0x4d49, USB_CLASS_VENDOR_SPEC, 0x10, 0x05),
|
|
|
|
|
++ .driver_info = (unsigned long)&qmi_wwan_info,
|
|
|
|
|
++ },
|
|
|
|
|
++
|
|
|
|
|
+ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0125)}, /* Quectel EC25, EC20 R2.0 Mini PCIe */
|
|
|
|
|
+ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0306)}, /* Quectel EP06/EG06/EM06 */
|
|
|
|
|
+ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0512)}, /* Quectel EG12/EM12 */
|
|
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */
|
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */
|
|
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL */
|
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL */
|
|
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)}, /* Quectel RM520N */
|
|
{QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)}, /* Quectel RM520N */
|
|
|
-+ {QMI_MATCH_FF_FF_FF(0x05c6, 0xf601)}, /* MeigLink SLM750 */
|
|
|
|
|
|
|
++ {QMI_MATCH_FF_FF_FF(0x05c6, 0xf601)}, /* MeigLink SLM750 */
|
|
|
|
|
|
|
|
/* 3. Combined interface devices matching on interface number */
|
|
/* 3. Combined interface devices matching on interface number */
|
|
|
{QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */
|
|
{QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */
|
|
|
--- a/drivers/usb/serial/option.c
|
|
--- a/drivers/usb/serial/option.c
|
|
|
+++ b/drivers/usb/serial/option.c
|
|
+++ b/drivers/usb/serial/option.c
|
|
|
-@@ -247,6 +247,8 @@ static void option_instat_callback(struc
|
|
|
|
|
|
|
+@@ -247,6 +247,11 @@ static void option_instat_callback(struc
|
|
|
#define UBLOX_PRODUCT_R410M 0x90b2
|
|
#define UBLOX_PRODUCT_R410M 0x90b2
|
|
|
/* These Yuga products use Qualcomm's vendor ID */
|
|
/* These Yuga products use Qualcomm's vendor ID */
|
|
|
#define YUGA_PRODUCT_CLM920_NC5 0x9625
|
|
#define YUGA_PRODUCT_CLM920_NC5 0x9625
|
|
|
+/* These MeigLink products use Qualcomm's vendor ID */
|
|
+/* These MeigLink products use Qualcomm's vendor ID */
|
|
|
+#define MEIGLINK_PRODUCT_SLM750 0xf601
|
|
+#define MEIGLINK_PRODUCT_SLM750 0xf601
|
|
|
|
|
++
|
|
|
|
|
++#define MEIGLINK_VENDOR_ID 0x2dee
|
|
|
|
|
++#define MEIGLINK_PRODUCT_SLM828 0x4d49
|
|
|
|
|
|
|
|
#define QUECTEL_VENDOR_ID 0x2c7c
|
|
#define QUECTEL_VENDOR_ID 0x2c7c
|
|
|
/* These Quectel products use Quectel's vendor ID */
|
|
/* These Quectel products use Quectel's vendor ID */
|
|
|
-@@ -1185,6 +1187,11 @@ static const struct usb_device_id option
|
|
|
|
|
|
|
+@@ -1144,6 +1149,11 @@ static const struct usb_device_id option
|
|
|
|
|
+ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
|
|
|
|
|
+ { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
|
|
|
|
|
+ .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
|
|
|
|
|
++ /* MeiG */
|
|
|
|
|
++ { USB_DEVICE_AND_INTERFACE_INFO(MEIGLINK_VENDOR_ID, MEIGLINK_PRODUCT_SLM828, USB_CLASS_VENDOR_SPEC, 0x10, 0x01) },
|
|
|
|
|
++ { USB_DEVICE_AND_INTERFACE_INFO(MEIGLINK_VENDOR_ID, MEIGLINK_PRODUCT_SLM828, USB_CLASS_VENDOR_SPEC, 0x10, 0x02) },
|
|
|
|
|
++ { USB_DEVICE_AND_INTERFACE_INFO(MEIGLINK_VENDOR_ID, MEIGLINK_PRODUCT_SLM828, USB_CLASS_VENDOR_SPEC, 0x10, 0x03) },
|
|
|
|
|
++ { USB_DEVICE_AND_INTERFACE_INFO(MEIGLINK_VENDOR_ID, MEIGLINK_PRODUCT_SLM828, USB_CLASS_VENDOR_SPEC, 0x10, 0x04) },
|
|
|
|
|
+ /* Quectel products using Qualcomm vendor ID */
|
|
|
|
|
+ { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
|
|
|
|
|
+ { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
|
|
|
|
|
+@@ -1185,6 +1195,11 @@ static const struct usb_device_id option
|
|
|
.driver_info = ZLP },
|
|
.driver_info = ZLP },
|
|
|
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
|
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
|
|
.driver_info = RSVD(4) },
|
|
.driver_info = RSVD(4) },
|