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

Merge tag 'usb-serial-5.19-rc2' of... 

Merge tag 'usb-serial-5.19-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Johan writes:

USB-serial fixes for 5.19-rc2

Here are some new device ids for a modem and an Edgeport device.

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

* tag 'usb-serial-5.19-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add support for Cinterion MV31 with new baseline
  USB: serial: io_ti: add Agilent E5805A support
parents f2906aa8 158f7585

drivers/usb/serial/io_ti.c

+2 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ static const struct usb_device_id edgeport_2port_id_table[] = { 
	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_8S) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416B) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_E5805A) },

	{ }

};
@@ -204,6 +205,7 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_8S) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_TI_EDGEPORT_416B) },

	{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_E5805A) },

	{ }

};

drivers/usb/serial/io_usbvend.h

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ 
//

// Definitions for other product IDs

#define ION_DEVICE_ID_MT4X56USB			0x1403	// OEM device

#define ION_DEVICE_ID_E5805A			0x1A01  // OEM device (rebranded Edgeport/4)





#define	GENERATION_ID_FROM_USB_PRODUCT_ID(ProductId)				\

drivers/usb/serial/option.c

+6 −0
Original line number Diff line number Diff line
@@ -432,6 +432,8 @@ static void option_instat_callback(struct urb *urb); 
#define CINTERION_PRODUCT_CLS8			0x00b0

#define CINTERION_PRODUCT_MV31_MBIM		0x00b3

#define CINTERION_PRODUCT_MV31_RMNET		0x00b7

#define CINTERION_PRODUCT_MV31_2_MBIM		0x00b8

#define CINTERION_PRODUCT_MV31_2_RMNET		0x00b9

#define CINTERION_PRODUCT_MV32_WA		0x00f1

#define CINTERION_PRODUCT_MV32_WB		0x00f2
@@ -1979,6 +1981,10 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = RSVD(3)},

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_RMNET, 0xff),

	  .driver_info = RSVD(0)},

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_2_MBIM, 0xff),

	  .driver_info = RSVD(3)},

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_2_RMNET, 0xff),

	  .driver_info = RSVD(0)},

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA, 0xff),

	  .driver_info = RSVD(3)},

	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB, 0xff),