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

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

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

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

 into usb-linus

Johan writes:

USB-serial fixes for v4.9-rc6

Here are a couple of new device ids.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 268200bc 2ab13292

drivers/usb/serial/cp210x.c

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */

	{ USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */

	{ USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */

	{ USB_DEVICE(0x10C4, 0x8962) }, /* Brim Brothers charging dock */

	{ 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 */

drivers/usb/serial/ftdi_sio.c

+2 −0
Original line number Diff line number Diff line
@@ -1012,6 +1012,8 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(ICPDAS_VID, ICPDAS_I7561U_PID) },

	{ USB_DEVICE(ICPDAS_VID, ICPDAS_I7563U_PID) },

	{ USB_DEVICE(WICED_VID, WICED_USB20706V2_PID) },

	{ USB_DEVICE(TI_VID, TI_CC3200_LAUNCHPAD_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ }					/* Terminating entry */

};

drivers/usb/serial/ftdi_sio_ids.h

+6 −0
Original line number Diff line number Diff line
@@ -595,6 +595,12 @@ 
#define ATMEL_VID		0x03eb /* Vendor ID */

#define STK541_PID		0x2109 /* Zigbee Controller */



/*

 * Texas Instruments

 */

#define TI_VID			0x0451

#define TI_CC3200_LAUNCHPAD_PID	0xC32A /* SimpleLink Wi-Fi CC3200 LaunchPad */



/*

 * Blackfin gnICE JTAG

 * http://docs.blackfin.uclinux.org/doku.php?id=hw:jtag:gnice