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

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

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

Johan writes:

USB serial device ids for 6.16-rc7

Here are some more device ids for 6.16-rc7.

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

* tag 'usb-serial-6.16-rc7' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: option: add Telit Cinterion FE910C04 (ECM) composition
  USB: serial: ftdi_sio: add support for NDI EMGUIDE GEMINI
parents 5724ff19 252f4ac0

drivers/usb/serial/ftdi_sio.c

+2 −0
Original line number Diff line number Diff line
@@ -803,6 +803,8 @@ static const struct usb_device_id id_table_combined[] = { 
		.driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_NDI_AURORA_SCU_PID),

		.driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk },

	{ USB_DEVICE(FTDI_NDI_VID, FTDI_NDI_EMGUIDE_GEMINI_PID),

		.driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk },

	{ USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },

	{ USB_DEVICE(NOVITUS_VID, NOVITUS_BONO_E_PID) },

	{ USB_DEVICE(FTDI_VID, RTSYSTEMS_USB_VX8_PID) },

drivers/usb/serial/ftdi_sio_ids.h

+3 −0
Original line number Diff line number Diff line
@@ -204,6 +204,9 @@ 
#define FTDI_NDI_FUTURE_3_PID		0xDA73	/* NDI future device #3 */

#define FTDI_NDI_AURORA_SCU_PID		0xDA74	/* NDI Aurora SCU */



#define FTDI_NDI_VID			0x23F2

#define FTDI_NDI_EMGUIDE_GEMINI_PID	0x0003	/* NDI Emguide Gemini */



/*

 * ChamSys Limited (www.chamsys.co.uk) USB wing/interface product IDs

 */

drivers/usb/serial/option.c

+3 −0
Original line number Diff line number Diff line
@@ -1415,6 +1415,9 @@ static const struct usb_device_id option_ids[] = { 
	  .driver_info = NCTRL(5) },

	{ USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10d0, 0xff, 0xff, 0x40) },

	{ USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10d0, 0xff, 0xff, 0x60) },

	{ USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10c7, 0xff, 0xff, 0x30),	/* Telit FE910C04 (ECM) */

	  .driver_info = NCTRL(4) },

	{ USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10c7, 0xff, 0xff, 0x40) },

	{ USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10d1, 0xff, 0xff, 0x30),	/* Telit FN990B (MBIM) */

	  .driver_info = NCTRL(6) },

	{ USB_DEVICE_AND_INTERFACE_INFO(TELIT_VENDOR_ID, 0x10d1, 0xff, 0xff, 0x40) },