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

Merge tag 'usb-serial-4.19-rc7' of... 

Merge tag 'usb-serial-4.19-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-linus

Johan writes:

USB-serial fixes for v4.19-rc7

Here are some device-id patches for 4.19-rc7.

Some Quectel modems have a vendor command which can be used to disable
certain interfaces in their configurations, but unlike some other modems
this also causes the interface numbers to change. These patches allow us
to support all such interface permutations at least for the Quectel
EP06.

All have been in linux-next with no reported issues.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>

* tag 'usb-serial-4.19-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: simple: add Motorola Tetra MTP6550 id
  USB: serial: option: add two-endpoints device-id flag
  USB: serial: option: improve Quectel EP06 detection
parents 17b57b18 f5fad711

drivers/usb/serial/option.c

+13 −2
Original line number Diff line number Diff line
@@ -561,6 +561,9 @@ static void option_instat_callback(struct urb *urb); 
/* Interface is reserved */

#define RSVD(ifnum)	((BIT(ifnum) & 0xff) << 0)



/* Interface must have two endpoints */

#define NUMEP2		BIT(16)





static const struct usb_device_id option_ids[] = {

	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
@@ -1081,8 +1084,9 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(4) },

	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),

	  .driver_info = RSVD(4) },

	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06),

	  .driver_info = RSVD(4) | RSVD(5) },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff),

	  .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 },

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },

	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),
@@ -1999,6 +2003,13 @@ static int option_probe(struct usb_serial *serial, 
	if (device_flags & RSVD(iface_desc->bInterfaceNumber))

		return -ENODEV;



	/*

	 * Allow matching on bNumEndpoints for devices whose interface numbers

	 * can change (e.g. Quectel EP06).

	 */

	if (device_flags & NUMEP2 && iface_desc->bNumEndpoints != 2)

		return -ENODEV;



	/* Store the device flags so we can use them during attach. */

	usb_set_serial_data(serial, (void *)device_flags);

drivers/usb/serial/usb-serial-simple.c

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ DEVICE(moto_modem, MOTO_IDS); 


/* Motorola Tetra driver */

#define MOTOROLA_TETRA_IDS()			\

	{ USB_DEVICE(0x0cad, 0x9011) }	/* Motorola Solutions TETRA PEI */

	{ USB_DEVICE(0x0cad, 0x9011) },	/* Motorola Solutions TETRA PEI */ \

	{ USB_DEVICE(0x0cad, 0x9012) }	/* MTP6550 */

DEVICE(motorola_tetra, MOTOROLA_TETRA_IDS);



/* Novatel Wireless GPS driver */

CRA Git | Maintained and supported by SUSTech CRA and CCSE