Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

 into usb-linus

Johan writes:

USB-serial fixes for v4.1-rc7

Here are a couple of new device ids.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 13557b5d df72d588

drivers/usb/serial/cp210x.c

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */

	{ USB_DEVICE(0x10C4, 0x8977) },	/* CEL MeshWorks DevKit Device */

	{ USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */

	{ USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */

	{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */

	{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */

	{ USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */

drivers/usb/serial/ftdi_sio.c

+1 −0
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(XSENS_VID, XSENS_AWINDA_DONGLE_PID) },

	{ USB_DEVICE(XSENS_VID, XSENS_AWINDA_STATION_PID) },

	{ USB_DEVICE(XSENS_VID, XSENS_CONVERTER_PID) },

	{ USB_DEVICE(XSENS_VID, XSENS_MTDEVBOARD_PID) },

	{ USB_DEVICE(XSENS_VID, XSENS_MTW_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },

	{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },

drivers/usb/serial/ftdi_sio_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 
#define XSENS_AWINDA_STATION_PID 0x0101

#define XSENS_AWINDA_DONGLE_PID 0x0102

#define XSENS_MTW_PID		0x0200	/* Xsens MTw */

#define XSENS_MTDEVBOARD_PID	0x0300	/* Motion Tracker Development Board */

#define XSENS_CONVERTER_PID	0xD00D	/* Xsens USB-serial converter */



/* Xsens devices using FTDI VID */