Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e9f44ea authored by Dan Williams's avatar Dan Williams Committed by Johan Hovold
Browse files

USB: serial: option: add Quectel UC15, UC20, EC21, and EC25 modems 



Add Quectel UC15, UC20, EC21, and EC25.  The EC20 is handled by
qcserial due to a USB VID/PID conflict with an existing Acer
device.

Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 4495c08e

drivers/usb/serial/option.c

+16 −1
Original line number Diff line number Diff line
@@ -233,6 +233,14 @@ static void option_instat_callback(struct urb *urb); 
#define BANDRICH_PRODUCT_1012			0x1012



#define QUALCOMM_VENDOR_ID			0x05C6

/* These Quectel products use Qualcomm's vendor ID */

#define QUECTEL_PRODUCT_UC20			0x9003

#define QUECTEL_PRODUCT_UC15			0x9090



#define QUECTEL_VENDOR_ID			0x2c7c

/* These Quectel products use Quectel's vendor ID */

#define QUECTEL_PRODUCT_EC21			0x0121

#define QUECTEL_PRODUCT_EC25			0x0125



#define CMOTECH_VENDOR_ID			0x16d8

#define CMOTECH_PRODUCT_6001			0x6001
@@ -1161,7 +1169,14 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9003), /* Quectel UC20 */

	/* Quectel products using Qualcomm vendor ID */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),

	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	/* Quectel products using Quectel vendor ID */

	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21),

	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25),

	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },