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

Commit fd290e70 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-4.11-rc4' of... 

Merge tag 'usb-serial-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-linus

Johan writes:

USB-serial fixes for v4.11-rc4

Some more device ids for option and qcserial.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 5617c05d 436ecf55

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) },

drivers/usb/serial/qcserial.c

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ static const struct usb_device_id id_table[] = { 
	{DEVICE_SWI(0x413c, 0x81a9)},	/* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */

	{DEVICE_SWI(0x413c, 0x81b1)},	/* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card */

	{DEVICE_SWI(0x413c, 0x81b3)},	/* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */

	{DEVICE_SWI(0x413c, 0x81b5)},	/* Dell Wireless 5811e QDL */

	{DEVICE_SWI(0x413c, 0x81b6)},	/* Dell Wireless 5811e QDL */



	/* Huawei devices */

	{DEVICE_HWI(0x03f0, 0x581d)},	/* HP lt4112 LTE/HSPA+ Gobi 4G Modem (Huawei me906e) */