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

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

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

Johan writes:

USB serial devices ids for 6.18-rc6

Here are some more modem and ftdi device ids.

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

* tag 'usb-serial-6.18-rc6' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add support for Rolling RW101R-GL
  USB: serial: ftdi_sio: add support for u-blox EVK-M101
parents 23379a17 523bf0a5

drivers/usb/serial/ftdi_sio.c

+1 −0
Original line number Diff line number Diff line
@@ -1074,6 +1074,7 @@ static const struct usb_device_id id_table_combined[] = { 
	/* U-Blox devices */

	{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) },

	{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) },

	{ USB_DEVICE_INTERFACE_NUMBER(UBLOX_VID, UBLOX_EVK_M101_PID, 2) },

	/* FreeCalypso USB adapters */

	{ USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_BUF_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

drivers/usb/serial/ftdi_sio_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1614,6 +1614,7 @@ 
#define UBLOX_VID			0x1546

#define UBLOX_C099F9P_ZED_PID		0x0502

#define UBLOX_C099F9P_ODIN_PID		0x0503

#define UBLOX_EVK_M101_PID		0x0506



/*

 * GMC devices

drivers/usb/serial/option.c

+8 −2
Original line number Diff line number Diff line
@@ -2424,12 +2424,18 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1406, 0xff) },			/* GosunCn GM500 ECM/NCM */

	{ USB_DEVICE(0x33f8, 0x0104),						/* Rolling RW101-GL (laptop RMNET) */

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

	{ USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x0115, 0xff),			/* Rolling RW135-GL (laptop MBIM) */

	  .driver_info = RSVD(5) },

	{ USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x01a2, 0xff) },			/* Rolling RW101-GL (laptop MBIM) */

	{ USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x01a3, 0xff) },			/* Rolling RW101-GL (laptop MBIM) */

	{ USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x01a4, 0xff),			/* Rolling RW101-GL (laptop MBIM) */

	  .driver_info = RSVD(4) },

	{ USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x0115, 0xff),			/* Rolling RW135-GL (laptop MBIM) */

	  .driver_info = RSVD(5) },

	{ USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x01a8, 0xff),			/* Rolling RW101R-GL (laptop MBIM) */

	  .driver_info = RSVD(4) },

	{ USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x01a9, 0xff),			/* Rolling RW101R-GL (laptop MBIM) */

	  .driver_info = RSVD(4) },

	{ USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x0301, 0xff) },			/* Rolling RW101R-GL (laptop MBIM) */

	{ USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x0302, 0xff) },			/* Rolling RW101R-GL (laptop MBIM) */

	{ USB_DEVICE_INTERFACE_CLASS(0x33f8, 0x0802, 0xff),			/* Rolling RW350-GL (laptop MBIM) */

	  .driver_info = RSVD(5) },

	{ USB_DEVICE_AND_INTERFACE_INFO(0x3731, 0x0100, 0xff, 0xff, 0x30) },	/* NetPrisma LCUK54-WWD for Global */