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

Merge tag 'usb-serial-6.1-rc6' of... 

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

Johan writes:
  "USB-serial fixes for 6.1-rc6

   Here are some new modem device ids for 6.1.

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

* tag 'usb-serial-6.1-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add u-blox LARA-L6 modem
  USB: serial: option: add u-blox LARA-R6 00B modem
  USB: serial: option: remove old LARA-R6 PID
  USB: serial: option: add Fibocom FM160 0x0111 composition
  USB: serial: option: add Sierra Wireless EM9191
parents 181135bb c1547f12

drivers/usb/serial/option.c

+17 −2
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ static void option_instat_callback(struct urb *urb); 
#define NOVATELWIRELESS_PRODUCT_G2		0xA010

#define NOVATELWIRELESS_PRODUCT_MC551		0xB001



#define UBLOX_VENDOR_ID				0x1546



/* AMOI PRODUCTS */

#define AMOI_VENDOR_ID				0x1614

#define AMOI_PRODUCT_H01			0x0800
@@ -240,7 +242,6 @@ static void option_instat_callback(struct urb *urb); 
#define QUECTEL_PRODUCT_UC15			0x9090

/* These u-blox products use Qualcomm's vendor ID */

#define UBLOX_PRODUCT_R410M			0x90b2

#define UBLOX_PRODUCT_R6XX			0x90fa

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

#define YUGA_PRODUCT_CLM920_NC5			0x9625
@@ -581,6 +582,9 @@ static void option_instat_callback(struct urb *urb); 
#define OPPO_VENDOR_ID				0x22d9

#define OPPO_PRODUCT_R11			0x276c



/* Sierra Wireless products */

#define SIERRA_VENDOR_ID			0x1199

#define SIERRA_PRODUCT_EM9191			0x90d3



/* Device flags */
@@ -1124,8 +1128,16 @@ static const struct usb_device_id option_ids[] = { 
	/* u-blox products using Qualcomm vendor ID */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M),

	  .driver_info = RSVD(1) | RSVD(3) },

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R6XX),

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x908b),	/* u-blox LARA-R6 00B */

	  .driver_info = RSVD(4) },

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x90fa),

	  .driver_info = RSVD(3) },

	/* u-blox products */

	{ USB_DEVICE(UBLOX_VENDOR_ID, 0x1341) },	/* u-blox LARA-L6 */

	{ USB_DEVICE(UBLOX_VENDOR_ID, 0x1342),		/* u-blox LARA-L6 (RMNET) */

	  .driver_info = RSVD(4) },

	{ USB_DEVICE(UBLOX_VENDOR_ID, 0x1343),		/* u-blox LARA-L6 (ECM) */

	  .driver_info = RSVD(4) },

	/* Quectel products using Quectel vendor ID */

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

	  .driver_info = NUMEP2 },
@@ -2167,6 +2179,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x010a, 0xff) },			/* Fibocom MA510 (ECM mode) */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) },	/* Fibocom FG150 Diag */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) },		/* Fibocom FG150 AT */

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0111, 0xff) },			/* Fibocom FM160 (MBIM mode) */

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) },			/* Fibocom NL668-AM/NL652-EU (laptop MBIM) */

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) },			/* Fibocom FM101-GL (laptop MBIM) */

	{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff),			/* Fibocom FM101-GL (laptop MBIM) */
@@ -2176,6 +2189,8 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1405, 0xff) },			/* GosunCn GM500 MBIM */

	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1406, 0xff) },			/* GosunCn GM500 ECM/NCM */

	{ USB_DEVICE_AND_INTERFACE_INFO(OPPO_VENDOR_ID, OPPO_PRODUCT_R11, 0xff, 0xff, 0x30) },

	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x30) },

	{ USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0, 0) },

	{ } /* Terminating entry */

};

MODULE_DEVICE_TABLE(usb, option_ids);