blame | history | patch | commit | commitdiff
hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2 
 kernel/drivers/usb/serial/option.c
....@@ -162,8 +162,6 @@
162162 #define NOVATELWIRELESS_PRODUCT_G2		0xA010
163163 #define NOVATELWIRELESS_PRODUCT_MC551		0xB001
164164 
165
-#define UBLOX_VENDOR_ID				0x1546
166
-
167165 /* AMOI PRODUCTS */
168166 #define AMOI_VENDOR_ID				0x1614
169167 #define AMOI_PRODUCT_H01			0x0800
....@@ -199,9 +197,6 @@
199197 #define DELL_PRODUCT_5804_MINICARD_ATT		0x819b  /* Novatel E371 */
200198 
201199 #define DELL_PRODUCT_5821E			0x81d7
202
-#define DELL_PRODUCT_5821E_ESIM			0x81e0
203
-#define DELL_PRODUCT_5829E_ESIM			0x81e4
204
-#define DELL_PRODUCT_5829E			0x81e6
205200 
206201 #define KYOCERA_VENDOR_ID			0x0c88
207202 #define KYOCERA_PRODUCT_KPC650			0x17da
....@@ -249,19 +244,9 @@
249244 /* These Quectel products use Quectel's vendor ID */
250245 #define QUECTEL_PRODUCT_EC21			0x0121
251246 #define QUECTEL_PRODUCT_EC25			0x0125
252
-#define QUECTEL_PRODUCT_EG91			0x0191
253
-#define QUECTEL_PRODUCT_EG95			0x0195
254247 #define QUECTEL_PRODUCT_BG96			0x0296
255248 #define QUECTEL_PRODUCT_EP06			0x0306
256
-#define QUECTEL_PRODUCT_EM05G			0x030a
257
-#define QUECTEL_PRODUCT_EM060K			0x030b
258
-#define QUECTEL_PRODUCT_EM05G_SG		0x0311
259249 #define QUECTEL_PRODUCT_EM12			0x0512
260
-#define QUECTEL_PRODUCT_RM500Q			0x0800
261
-#define QUECTEL_PRODUCT_RM520N			0x0801
262
-#define QUECTEL_PRODUCT_EC200S_CN		0x6002
263
-#define QUECTEL_PRODUCT_EC200T			0x6026
264
-#define QUECTEL_PRODUCT_RM500K			0x7001
265250 
266251 #define CMOTECH_VENDOR_ID			0x16d8
267252 #define CMOTECH_PRODUCT_6001			0x6001
....@@ -430,20 +415,10 @@
430415 #define CINTERION_PRODUCT_PH8			0x0053
431416 #define CINTERION_PRODUCT_AHXX			0x0055
432417 #define CINTERION_PRODUCT_PLXX			0x0060
433
-#define CINTERION_PRODUCT_EXS82			0x006c
434418 #define CINTERION_PRODUCT_PH8_2RMNET		0x0082
435419 #define CINTERION_PRODUCT_PH8_AUDIO		0x0083
436420 #define CINTERION_PRODUCT_AHXX_2RMNET		0x0084
437421 #define CINTERION_PRODUCT_AHXX_AUDIO		0x0085
438
-#define CINTERION_PRODUCT_CLS8			0x00b0
439
-#define CINTERION_PRODUCT_MV31_MBIM		0x00b3
440
-#define CINTERION_PRODUCT_MV31_RMNET		0x00b7
441
-#define CINTERION_PRODUCT_MV31_2_MBIM		0x00b8
442
-#define CINTERION_PRODUCT_MV31_2_RMNET		0x00b9
443
-#define CINTERION_PRODUCT_MV32_WA		0x00f1
444
-#define CINTERION_PRODUCT_MV32_WB		0x00f2
445
-#define CINTERION_PRODUCT_MV32_WA_RMNET		0x00f3
446
-#define CINTERION_PRODUCT_MV32_WB_RMNET		0x00f4
447422 
448423 /* Olivetti products */
449424 #define OLIVETTI_VENDOR_ID			0x0b3c
....@@ -549,7 +524,6 @@
549524 /* Cellient products */
550525 #define CELLIENT_VENDOR_ID			0x2692
551526 #define CELLIENT_PRODUCT_MEN200			0x9005
552
-#define CELLIENT_PRODUCT_MPL200			0x9025
553527 
554528 /* Hyundai Petatel Inc. products */
555529 #define PETATEL_VENDOR_ID			0x1ff4
....@@ -579,18 +553,8 @@
579553 #define WETELECOM_PRODUCT_6802			0x6802
580554 #define WETELECOM_PRODUCT_WMD300		0x6803
581555 
582
-/* OPPO products */
583
-#define OPPO_VENDOR_ID				0x22d9
584
-#define OPPO_PRODUCT_R11			0x276c
585
-
586
-/* Sierra Wireless products */
587
-#define SIERRA_VENDOR_ID			0x1199
588
-#define SIERRA_PRODUCT_EM9191			0x90d3
589556 
590557 /* Device flags */
591
-
592
-/* Highest interface number which can be used with NCTRL() and RSVD() */
593
-#define FLAG_IFNUM_MAX	7
594558 
595559 /* Interface does not support modem-control requests */
596560 #define NCTRL(ifnum)	((BIT(ifnum) & 0xff) << 8)
....@@ -601,11 +565,34 @@
601565 /* Interface must have two endpoints */
602566 #define NUMEP2		BIT(16)
603567 
604
-/* Device needs ZLP */
605
-#define ZLP		BIT(17)
606
-
607568 
608569 static const struct usb_device_id option_ids[] = {
570
+#if 1 //Added by Quectel
571
+	{ USB_DEVICE(0x05C6, 0x9090) }, /* Quectel UC15 */
572
+	{ USB_DEVICE(0x05C6, 0x9003) }, /* Quectel UC20 */
573
+	{ USB_DEVICE(0x05C6, 0x9215) }, /* Quectel EC20(MDM9215) */
574
+	{ USB_DEVICE(0x2C7C, 0x0125) }, /* Quectel EC20(MDM9x07)/EC25/EG25 */
575
+	{ USB_DEVICE(0x2C7C, 0x0121) }, /* Quectel EC21 */
576
+	{ USB_DEVICE(0x2C7C, 0x0191) }, /* Quectel EG91 */
577
+	{ USB_DEVICE(0x2C7C, 0x0195) }, /* Quectel EG95 */
578
+	{ USB_DEVICE(0x2C7C, 0x0306) }, /* Quectel EG06/EP06/EM06 */
579
+	{ USB_DEVICE(0x2C7C, 0x030B) }, /* Quectel EG065K/EG060K */
580
+	{ USB_DEVICE(0x2C7C, 0x0514) }, /* Quectel BL EG060K RNDIS Only */
581
+	{ USB_DEVICE(0x2C7C, 0x0512) }, /* Quectel EG12/EP12/EM12/EG16/EG18 */
582
+	{ USB_DEVICE(0x2C7C, 0x0296) }, /* Quectel BG96 */
583
+	{ USB_DEVICE(0x2C7C, 0x0700) }, /* Quectel BG95/BG77/BG600L-M3/BC69 */
584
+	{ USB_DEVICE(0x2C7C, 0x0435) }, /* Quectel AG35 */
585
+	{ USB_DEVICE(0x2C7C, 0x0415) }, /* Quectel AG15 */
586
+	{ USB_DEVICE(0x2C7C, 0x0452) }, /* Quectel AG520 */
587
+	{ USB_DEVICE(0x2C7C, 0x0455) }, /* Quectel AG550 */
588
+	{ USB_DEVICE(0x2C7C, 0x0620) }, /* Quectel EG20 */
589
+	{ USB_DEVICE(0x2C7C, 0x0800) }, /* Quectel RG500/RM500/RG510/RM510 */
590
+	{ USB_DEVICE(0x2C7C, 0x0801) }, /* Quectel RG520/RM520/SG520 */
591
+	{ USB_DEVICE(0x2C7C, 0x6026) }, /* Quectel EC200 */
592
+	{ USB_DEVICE(0x2C7C, 0x6120) }, /* Quectel UC200 */
593
+	{ USB_DEVICE(0x2C7C, 0x6000) }, /* Quectel EC200/UC200 */
594
+	{ .match_flags = USB_DEVICE_ID_MATCH_VENDOR, .idVendor = 0x2C7C }, /* Match All Quectel Modules */
595
+#endif
609596 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
610597 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
611598 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
....@@ -1007,11 +994,6 @@
1007994 	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7B) },
1008995 	{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x06, 0x7C) },
1009996 
1010
-	/* Motorola devices */
1011
-	{ USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x2a70, 0xff, 0xff, 0xff) },	/* mdm6600 */
1012
-	{ USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x2e0a, 0xff, 0xff, 0xff) },	/* mdm9600 */
1013
-	{ USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x4281, 0x0a, 0x00, 0xfc) },	/* mdm ram dl */
1014
-	{ USB_DEVICE_AND_INTERFACE_INFO(0x22b8, 0x900e, 0xff, 0xff, 0xff) },	/* mdm qc dl */
1015997 
1016998 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) },
1017999 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) },
....@@ -1082,12 +1064,6 @@
10821064 	{ USB_DEVICE_AND_INTERFACE_INFO(DELL_VENDOR_ID, DELL_PRODUCT_5804_MINICARD_ATT, 0xff, 0xff, 0xff) },
10831065 	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5821E),
10841066 	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },
1085
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5821E_ESIM),
1086
-	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },
1087
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5829E),
1088
-	  .driver_info = RSVD(0) | RSVD(6) },
1089
-	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5829E_ESIM),
1090
-	  .driver_info = RSVD(0) | RSVD(6) },
10911067 	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },	/* ADU-E100, ADU-310 */
10921068 	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
10931069 	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) },
....@@ -1129,61 +1105,19 @@
11291105 	/* u-blox products using Qualcomm vendor ID */
11301106 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M),
11311107 	  .driver_info = RSVD(1) | RSVD(3) },
1132
-	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x908b),	/* u-blox LARA-R6 00B */
1133
-	  .driver_info = RSVD(4) },
1134
-	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x90fa),
1135
-	  .driver_info = RSVD(3) },
1136
-	/* u-blox products */
1137
-	{ USB_DEVICE(UBLOX_VENDOR_ID, 0x1341) },	/* u-blox LARA-L6 */
1138
-	{ USB_DEVICE(UBLOX_VENDOR_ID, 0x1342),		/* u-blox LARA-L6 (RMNET) */
1139
-	  .driver_info = RSVD(4) },
1140
-	{ USB_DEVICE(UBLOX_VENDOR_ID, 0x1343),		/* u-blox LARA-L6 (ECM) */
1141
-	  .driver_info = RSVD(4) },
11421108 	/* Quectel products using Quectel vendor ID */
1143
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0xff, 0xff),
1144
-	  .driver_info = NUMEP2 },
1145
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0, 0) },
1146
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25, 0xff, 0xff, 0xff),
1147
-	  .driver_info = NUMEP2 },
1148
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25, 0xff, 0, 0) },
1149
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG91, 0xff, 0xff, 0xff),
1150
-	  .driver_info = NUMEP2 },
1151
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG91, 0xff, 0, 0) },
1152
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff),
1153
-	  .driver_info = NUMEP2 },
1154
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
1155
-	{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, 0x0203, 0xff), /* BG95-M3 */
1156
-	  .driver_info = ZLP },
1109
+	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21),
1110
+	  .driver_info = RSVD(4) },
1111
+	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25),
1112
+	  .driver_info = RSVD(4) },
11571113 	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
11581114 	  .driver_info = RSVD(4) },
11591115 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),
11601116 	  .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 },
11611117 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) },
1162
-	{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G, 0xff),
1163
-	  .driver_info = RSVD(6) | ZLP },
1164
-	{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G_SG, 0xff),
1165
-	  .driver_info = RSVD(6) | ZLP },
1166
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0x00, 0x40) },
1167
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0xff, 0x30) },
1168
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0xff, 0x40) },
11691118 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0xff, 0xff),
11701119 	  .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 },
11711120 	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0, 0) },
1172
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, 0x0620, 0xff, 0xff, 0x30) },	/* EM160R-GL */
1173
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, 0x0620, 0xff, 0, 0) },
1174
-	{ USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, 0x0700, 0xff), /* BG95 */
1175
-	  .driver_info = RSVD(3) | ZLP },
1176
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x30) },
1177
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) },
1178
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10),
1179
-	  .driver_info = ZLP },
1180
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0xff, 0x30) },
1181
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0x40) },
1182
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0) },
1183
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
1184
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },
1185
-	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },
1186
-
11871121 	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },
11881122 	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },
11891123 	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),
....@@ -1231,10 +1165,6 @@
12311165 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_SINGLE) },
12321166 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) },
12331167 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UE910_V2) },
1234
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1031, 0xff),	/* Telit LE910C1-EUX */
1235
-	 .driver_info = NCTRL(0) | RSVD(3) },
1236
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1033, 0xff),	/* Telit LE910C1-EUX (ECM) */
1237
-	 .driver_info = NCTRL(0) },
12381168 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG0),
12391169 	  .driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) },
12401170 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG1),
....@@ -1245,58 +1175,14 @@
12451175 	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
12461176 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG5, 0xff),
12471177 	  .driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) },
1248
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1050, 0xff),	/* Telit FN980 (rmnet) */
1249
-	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
1250
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1051, 0xff),	/* Telit FN980 (MBIM) */
1251
-	  .driver_info = NCTRL(0) | RSVD(1) },
1252
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1052, 0xff),	/* Telit FN980 (RNDIS) */
1253
-	  .driver_info = NCTRL(2) | RSVD(3) },
1254
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1053, 0xff),	/* Telit FN980 (ECM) */
1255
-	  .driver_info = NCTRL(0) | RSVD(1) },
1256
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1054, 0xff),	/* Telit FT980-KS */
1257
-	  .driver_info = NCTRL(2) | RSVD(3) },
1258
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1055, 0xff),	/* Telit FN980 (PCIe) */
1259
-	  .driver_info = NCTRL(0) | RSVD(1) },
1260
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1056, 0xff),	/* Telit FD980 */
1261
-	  .driver_info = NCTRL(2) | RSVD(3) },
1262
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1057, 0xff),	/* Telit FN980 */
1263
-	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
1264
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1058, 0xff),	/* Telit FN980 (PCIe) */
1265
-	  .driver_info = NCTRL(0) | RSVD(1) },
1266
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1060, 0xff),	/* Telit LN920 (rmnet) */
1267
-	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
1268
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1061, 0xff),	/* Telit LN920 (MBIM) */
1269
-	  .driver_info = NCTRL(0) | RSVD(1) },
1270
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1062, 0xff),	/* Telit LN920 (RNDIS) */
1271
-	  .driver_info = NCTRL(2) | RSVD(3) },
1272
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1063, 0xff),	/* Telit LN920 (ECM) */
1273
-	  .driver_info = NCTRL(0) | RSVD(1) },
1274
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1070, 0xff),	/* Telit FN990 (rmnet) */
1275
-	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
1276
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1071, 0xff),	/* Telit FN990 (MBIM) */
1277
-	  .driver_info = NCTRL(0) | RSVD(1) },
1278
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1072, 0xff),	/* Telit FN990 (RNDIS) */
1279
-	  .driver_info = NCTRL(2) | RSVD(3) },
1280
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1073, 0xff),	/* Telit FN990 (ECM) */
1281
-	  .driver_info = NCTRL(0) | RSVD(1) },
1282
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1075, 0xff),	/* Telit FN990 (PCIe) */
1283
-	  .driver_info = RSVD(0) },
12841178 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),
12851179 	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(3) },
12861180 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM),
12871181 	  .driver_info = NCTRL(0) | RSVD(3) },
12881182 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1102, 0xff),	/* Telit ME910 (ECM) */
12891183 	  .driver_info = NCTRL(0) },
1290
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x110a, 0xff),	/* Telit ME910G1 */
1291
-	  .driver_info = NCTRL(0) | RSVD(3) },
1292
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x110b, 0xff),	/* Telit ME910G1 (ECM) */
1293
-	  .driver_info = NCTRL(0) },
12941184 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910),
12951185 	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
1296
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1203, 0xff),	/* Telit LE910Cx (RNDIS) */
1297
-	  .driver_info = NCTRL(2) | RSVD(3) },
1298
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1204, 0xff),	/* Telit LE910Cx (MBIM) */
1299
-	  .driver_info = NCTRL(0) | RSVD(1) },
13001186 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910_USBCFG4),
13011187 	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
13021188 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920),
....@@ -1311,33 +1197,10 @@
13111197 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1213, 0xff) },
13121198 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1214),
13131199 	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
1314
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1230, 0xff),	/* Telit LE910Cx (rmnet) */
1315
-	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
1316
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1231, 0xff),	/* Telit LE910Cx (RNDIS) */
1317
-	  .driver_info = NCTRL(2) | RSVD(3) },
1318
-	{ USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x1250, 0xff, 0x00, 0x00) },	/* Telit LE910Cx (rmnet) */
1319
-	{ USB_DEVICE(TELIT_VENDOR_ID, 0x1260),
1320
-	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
1321
-	{ USB_DEVICE(TELIT_VENDOR_ID, 0x1261),
1322
-	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
13231200 	{ USB_DEVICE(TELIT_VENDOR_ID, 0x1900),				/* Telit LN940 (QMI) */
13241201 	  .driver_info = NCTRL(0) | RSVD(1) },
13251202 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff),	/* Telit LN940 (MBIM) */
13261203 	  .driver_info = NCTRL(0) },
1327
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7010, 0xff),	/* Telit LE910-S1 (RNDIS) */
1328
-	  .driver_info = NCTRL(2) },
1329
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x7011, 0xff),	/* Telit LE910-S1 (ECM) */
1330
-	  .driver_info = NCTRL(2) },
1331
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x701a, 0xff),	/* Telit LE910R1 (RNDIS) */
1332
-	  .driver_info = NCTRL(2) },
1333
-	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x701b, 0xff),	/* Telit LE910R1 (ECM) */
1334
-	  .driver_info = NCTRL(2) },
1335
-	{ USB_DEVICE(TELIT_VENDOR_ID, 0x9010),				/* Telit SBL FN980 flashing device */
1336
-	  .driver_info = NCTRL(0) | ZLP },
1337
-	{ USB_DEVICE(TELIT_VENDOR_ID, 0x9200),				/* Telit LE910S1 flashing device */
1338
-	  .driver_info = NCTRL(0) | ZLP },
1339
-	{ USB_DEVICE(TELIT_VENDOR_ID, 0x9201),				/* Telit LE910R1 flashing device */
1340
-	  .driver_info = NCTRL(0) | ZLP },
13411204 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
13421205 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff),
13431206 	  .driver_info = RSVD(1) },
....@@ -1502,7 +1365,6 @@
15021365 	  .driver_info = RSVD(4) },
15031366 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0414, 0xff, 0xff, 0xff) },
15041367 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0417, 0xff, 0xff, 0xff) },
1505
-	{ USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x0601, 0xff) },	/* GosunCn ZTE WeLink ME3630 (RNDIS mode) */
15061368 	{ USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x0602, 0xff) },	/* GosunCn ZTE WeLink ME3630 (MBIM mode) */
15071369 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff),
15081370 	  .driver_info = RSVD(4) },
....@@ -1665,8 +1527,7 @@
16651527 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1272, 0xff, 0xff, 0xff) },
16661528 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1273, 0xff, 0xff, 0xff) },
16671529 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1274, 0xff, 0xff, 0xff) },
1668
-	{ USB_DEVICE(ZTE_VENDOR_ID, 0x1275),	/* ZTE P685M */
1669
-	  .driver_info = RSVD(3) | RSVD(4) },
1530
+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1275, 0xff, 0xff, 0xff) },
16701531 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1276, 0xff, 0xff, 0xff) },
16711532 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1277, 0xff, 0xff, 0xff) },
16721533 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1278, 0xff, 0xff, 0xff) },
....@@ -1709,9 +1570,6 @@
17091570 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1428, 0xff, 0xff, 0xff),  /* Telewell TW-LTE 4G v2 */
17101571 	  .driver_info = RSVD(2) },
17111572 	{ USB_DEVICE_INTERFACE_CLASS(ZTE_VENDOR_ID, 0x1476, 0xff) },	/* GosunCn ZTE WeLink ME3630 (ECM/NCM mode) */
1712
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1481, 0xff, 0x00, 0x00) }, /* ZTE MF871A */
1713
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1485, 0xff, 0xff, 0xff),  /* ZTE MF286D */
1714
-	  .driver_info = RSVD(5) },
17151573 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1533, 0xff, 0xff, 0xff) },
17161574 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1534, 0xff, 0xff, 0xff) },
17171575 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1535, 0xff, 0xff, 0xff) },
....@@ -1739,6 +1597,7 @@
17391597 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0060, 0xff, 0xff, 0xff) },
17401598 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0070, 0xff, 0xff, 0xff) },
17411599 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0073, 0xff, 0xff, 0xff) },
1600
+	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0094, 0xff, 0xff, 0xff) },
17421601 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0130, 0xff, 0xff, 0xff),
17431602 	  .driver_info = RSVD(1) },
17441603 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0133, 0xff, 0xff, 0xff),
....@@ -1939,10 +1798,6 @@
19391798 	{ USB_DEVICE(ALINK_VENDOR_ID, SIMCOM_PRODUCT_SIM7100E),
19401799 	  .driver_info = RSVD(5) | RSVD(6) },
19411800 	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9003, 0xff) },	/* Simcom SIM7500/SIM7600 MBIM mode */
1942
-	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9011, 0xff),	/* Simcom SIM7500/SIM7600 RNDIS mode */
1943
-	  .driver_info = RSVD(7) },
1944
-	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9205, 0xff) },	/* Simcom SIM7070/SIM7080/SIM7090 AT+ECM mode */
1945
-	{ USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9206, 0xff) },	/* Simcom SIM7070/SIM7080/SIM7090 AT-only mode */
19461801 	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
19471802 	  .driver_info = NCTRL(0) | NCTRL(1) | RSVD(4) },
19481803 	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),
....@@ -2005,31 +1860,12 @@
20051860 	  .driver_info = RSVD(4) },
20061861 	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_2RMNET, 0xff) },
20071862 	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_AUDIO, 0xff) },
2008
-	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_CLS8, 0xff),
2009
-	  .driver_info = RSVD(0) | RSVD(4) },
2010
-	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EXS82, 0xff) },
20111863 	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) },
20121864 	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
20131865 	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },
20141866 	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDMNET) },
20151867 	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */
20161868 	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
2017
-	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_MBIM, 0xff),
2018
-	  .driver_info = RSVD(3)},
2019
-	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_RMNET, 0xff),
2020
-	  .driver_info = RSVD(0)},
2021
-	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_2_MBIM, 0xff),
2022
-	  .driver_info = RSVD(3)},
2023
-	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_2_RMNET, 0xff),
2024
-	  .driver_info = RSVD(0)},
2025
-	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA, 0xff),
2026
-	  .driver_info = RSVD(3)},
2027
-	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA_RMNET, 0xff),
2028
-	  .driver_info = RSVD(0) },
2029
-	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB, 0xff),
2030
-	  .driver_info = RSVD(3)},
2031
-	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB_RMNET, 0xff),
2032
-	  .driver_info = RSVD(0) },
20331869 	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100),
20341870 	  .driver_info = RSVD(4) },
20351871 	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120),
....@@ -2117,8 +1953,6 @@
21171953 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x02, 0x01) },
21181954 	{ USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) },
21191955 	{ USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) },
2120
-	{ USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MPL200),
2121
-	  .driver_info = RSVD(1) | RSVD(4) },
21221956 	{ USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T_600A) },
21231957 	{ USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T_600E) },
21241958 	{ USB_DEVICE_AND_INTERFACE_INFO(TPLINK_VENDOR_ID, TPLINK_PRODUCT_LTE, 0xff, 0x00, 0x00) },	/* TP-Link LTE Module */
....@@ -2137,20 +1971,10 @@
21371971 	  .driver_info = RSVD(4) },
21381972 	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff),			/* D-Link DWM-222 */
21391973 	  .driver_info = RSVD(4) },
2140
-	{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e3d, 0xff),			/* D-Link DWM-222 A2 */
2141
-	  .driver_info = RSVD(4) },
21421974 	{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) },	/* D-Link DWM-152/C1 */
21431975 	{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) },	/* D-Link DWM-156/C1 */
21441976 	{ USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) },	/* D-Link DWM-156/A3 */
2145
-	{ USB_DEVICE_INTERFACE_CLASS(0x1435, 0xd191, 0xff),			/* Wistron Neweb D19Q1 */
2146
-	  .driver_info = RSVD(1) | RSVD(4) },
2147
-	{ USB_DEVICE_INTERFACE_CLASS(0x1690, 0x7588, 0xff),			/* ASKEY WWHC050 */
2148
-	  .driver_info = RSVD(1) | RSVD(4) },
21491977 	{ USB_DEVICE_INTERFACE_CLASS(0x2020, 0x2031, 0xff),			/* Olicard 600 */
2150
-	  .driver_info = RSVD(4) },
2151
-	{ USB_DEVICE_INTERFACE_CLASS(0x2020, 0x2033, 0xff),			/* BroadMobi BM806U */
2152
-	  .driver_info = RSVD(4) },
2153
-	{ USB_DEVICE_INTERFACE_CLASS(0x2020, 0x2060, 0xff),			/* BroadMobi BM818 */
21541978 	  .driver_info = RSVD(4) },
21551979 	{ USB_DEVICE_INTERFACE_CLASS(0x2020, 0x4000, 0xff) },			/* OLICARD300 - MT6225 */
21561980 	{ USB_DEVICE(INOVIA_VENDOR_ID, INOVIA_SEW858) },
....@@ -2164,36 +1988,12 @@
21641988 	{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x13) },
21651989 	{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x14) },
21661990 	{ USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x1b) },
2167
-	{ USB_DEVICE(0x0489, 0xe0b4),						/* Foxconn T77W968 */
2168
-	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },
2169
-	{ USB_DEVICE(0x0489, 0xe0b5),						/* Foxconn T77W968 ESIM */
2170
-	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },
2171
-	{ USB_DEVICE_INTERFACE_CLASS(0x0489, 0xe0db, 0xff),			/* Foxconn T99W265 MBIM */
2172
-	  .driver_info = RSVD(3) },
2173
-	{ USB_DEVICE(0x1508, 0x1001),						/* Fibocom NL668 (IOT version) */
1991
+	{ USB_DEVICE(0x1508, 0x1001),						/* Fibocom NL668 */
21741992 	  .driver_info = RSVD(4) | RSVD(5) | RSVD(6) },
2175
-	{ USB_DEVICE(0x1782, 0x4d10) },						/* Fibocom L610 (AT mode) */
2176
-	{ USB_DEVICE_INTERFACE_CLASS(0x1782, 0x4d11, 0xff) },			/* Fibocom L610 (ECM/RNDIS mode) */
21771993 	{ USB_DEVICE(0x2cb7, 0x0104),						/* Fibocom NL678 series */
21781994 	  .driver_info = RSVD(4) | RSVD(5) },
21791995 	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0105, 0xff),			/* Fibocom NL678 series */
21801996 	  .driver_info = RSVD(6) },
2181
-	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0106, 0xff) },			/* Fibocom MA510 (ECM mode w/ diag intf.) */
2182
-	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x010a, 0xff) },			/* Fibocom MA510 (ECM mode) */
2183
-	{ USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) },	/* Fibocom FG150 Diag */
2184
-	{ USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) },		/* Fibocom FG150 AT */
2185
-	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0111, 0xff) },			/* Fibocom FM160 (MBIM mode) */
2186
-	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) },			/* Fibocom NL668-AM/NL652-EU (laptop MBIM) */
2187
-	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) },			/* Fibocom FM101-GL (laptop MBIM) */
2188
-	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff),			/* Fibocom FM101-GL (laptop MBIM) */
2189
-	  .driver_info = RSVD(4) },
2190
-	{ USB_DEVICE_INTERFACE_CLASS(0x2df3, 0x9d03, 0xff) },			/* LongSung M5710 */
2191
-	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1404, 0xff) },			/* GosunCn GM500 RNDIS */
2192
-	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1405, 0xff) },			/* GosunCn GM500 MBIM */
2193
-	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1406, 0xff) },			/* GosunCn GM500 ECM/NCM */
2194
-	{ USB_DEVICE_AND_INTERFACE_INFO(OPPO_VENDOR_ID, OPPO_PRODUCT_R11, 0xff, 0xff, 0x30) },
2195
-	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x30) },
2196
-	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0, 0) },
21971997 	{ } /* Terminating entry */
21981998 };
21991999 MODULE_DEVICE_TABLE(usb, option_ids);
....@@ -2202,7 +2002,26 @@
22022002  * recognizes separately, thus num_port=1.
22032003  */
22042004 
2005
+#if 1 //Added by Quectel
2006
+static void cfmakeraw(struct ktermios *t)
2007
+{
2008
+	t->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
2009
+	t->c_oflag &= ~OPOST;
2010
+	t->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
2011
+	t->c_cflag &= ~(CSIZE|PARENB);
2012
+	t->c_cflag |= CS8;
2013
+	t->c_cc[VMIN] = 1;
2014
+	t->c_cc[VTIME] = 0;
2015
+}
2016
+
2017
+static void option_init_termios(struct tty_struct *tty)
2018
+{
2019
+	cfmakeraw(&tty->termios);
2020
+}
2021
+#endif
2022
+
22052023 static struct usb_serial_driver option_1port_device = {
2024
+	.init_termios  = option_init_termios,
22062025 	.driver = {
22072026 		.owner =	THIS_MODULE,
22082027 		.name =		"option1",
....@@ -2229,6 +2048,9 @@
22292048 #ifdef CONFIG_PM
22302049 	.suspend           = usb_wwan_suspend,
22312050 	.resume            = usb_wwan_resume,
2051
+#if 1 //Added by Quectel
2052
+	.reset_resume = usb_wwan_resume,
2053
+#endif
22322054 #endif
22332055 };
22342056 
....@@ -2238,20 +2060,41 @@
22382060 
22392061 module_usb_serial_driver(serial_drivers, option_ids);
22402062 
2241
-static bool iface_is_reserved(unsigned long device_flags, u8 ifnum)
2242
-{
2243
-	if (ifnum > FLAG_IFNUM_MAX)
2244
-		return false;
2245
-
2246
-	return device_flags & RSVD(ifnum);
2247
-}
2248
-
22492063 static int option_probe(struct usb_serial *serial,
22502064 			const struct usb_device_id *id)
22512065 {
22522066 	struct usb_interface_descriptor *iface_desc =
22532067 				&serial->interface->cur_altsetting->desc;
22542068 	unsigned long device_flags = id->driver_info;
2069
+
2070
+#if 1 //Added by Quectel
2071
+	//Quectel UC20's interface 4 can be used as USB Network device
2072
+	if (serial->dev->descriptor.idVendor == cpu_to_le16(0x05C6) && serial->dev->descriptor.idProduct == cpu_to_le16(0x9003)
2073
+		&& serial->interface->cur_altsetting->desc.bInterfaceNumber >= 4)
2074
+		return -ENODEV;
2075
+
2076
+	//Quectel EC20(MDM9215)'s interface 4 can be used as USB Network device
2077
+	if (serial->dev->descriptor.idVendor == cpu_to_le16(0x05C6) && serial->dev->descriptor.idProduct == cpu_to_le16(0x9215)
2078
+		&& serial->interface->cur_altsetting->desc.bInterfaceNumber >= 4)
2079
+		return -ENODEV;
2080
+
2081
+	if (serial->dev->descriptor.idVendor == cpu_to_le16(0x2C7C)) {
2082
+		__u16 idProduct = le16_to_cpu(serial->dev->descriptor.idProduct);
2083
+		struct usb_interface_descriptor *intf = &serial->interface->cur_altsetting->desc;
2084
+
2085
+		if (intf->bInterfaceClass != 0xFF || intf->bInterfaceSubClass == 0x42) {
2086
+			//ECM, RNDIS, NCM, MBIM, ACM, UAC, ADB
2087
+			return -ENODEV;
2088
+		}
2089
+
2090
+		if ((idProduct&0xF000) == 0x0000) {
2091
+			//MDM interface 4 is QMI
2092
+			if (intf->bInterfaceNumber == 4 && intf->bNumEndpoints == 3
2093
+				&& intf->bInterfaceSubClass == 0xFF && intf->bInterfaceProtocol == 0xFF)
2094
+				return -ENODEV;
2095
+		}
2096
+	}
2097
+#endif
22552098 
22562099 	/* Never bind to the CD-Rom emulation interface	*/
22572100 	if (iface_desc->bInterfaceClass == USB_CLASS_MASS_STORAGE)
....@@ -2262,7 +2105,7 @@
22622105 	 * the same class/subclass/protocol as the serial interfaces.  Look at
22632106 	 * the Windows driver .INF files for reserved interface numbers.
22642107 	 */
2265
-	if (iface_is_reserved(device_flags, iface_desc->bInterfaceNumber))
2108
+	if (device_flags & RSVD(iface_desc->bInterfaceNumber))
22662109 		return -ENODEV;
22672110 
22682111 	/*
....@@ -2276,14 +2119,6 @@
22762119 	usb_set_serial_data(serial, (void *)device_flags);
22772120 
22782121 	return 0;
2279
-}
2280
-
2281
-static bool iface_no_modem_control(unsigned long device_flags, u8 ifnum)
2282
-{
2283
-	if (ifnum > FLAG_IFNUM_MAX)
2284
-		return false;
2285
-
2286
-	return device_flags & NCTRL(ifnum);
22872122 }
22882123 
22892124 static int option_attach(struct usb_serial *serial)
....@@ -2301,11 +2136,8 @@
23012136 
23022137 	iface_desc = &serial->interface->cur_altsetting->desc;
23032138 
2304
-	if (!iface_no_modem_control(device_flags, iface_desc->bInterfaceNumber))
2139
+	if (!(device_flags & NCTRL(iface_desc->bInterfaceNumber)))
23052140 		data->use_send_setup = 1;
2306
-
2307
-	if (device_flags & ZLP)
2308
-		data->use_zlp = 1;
23092141 
23102142 	spin_lock_init(&data->susp_lock);
23112143 
....@@ -2333,7 +2165,8 @@
23332165 	dev_dbg(dev, "%s: urb %p port %p has data %p\n", __func__, urb, port, portdata);
23342166 
23352167 	if (status == 0) {
2336
-		struct usb_ctrlrequest *req_pkt = urb->transfer_buffer;
2168
+		struct usb_ctrlrequest *req_pkt =
2169
+				(struct usb_ctrlrequest *)urb->transfer_buffer;
23372170 
23382171 		if (!req_pkt) {
23392172 			dev_dbg(dev, "%s: NULL req_pkt\n", __func__);
....@@ -2366,7 +2199,7 @@
23662199 		dev_dbg(dev, "%s: error %d\n", __func__, status);
23672200 
23682201 	/* Resubmit urb so we continue receiving IRQ data */
2369
-	if (status != -ESHUTDOWN && status != -ENOENT) {
2202
+	if (status != -ESHUTDOWN && status != -ENOENT && status != -EPROTO) {
23702203 		usb_mark_last_busy(port->serial->dev);
23712204 		err = usb_submit_urb(urb, GFP_ATOMIC);
23722205 		if (err)