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

Commit dee5658b authored by Daniel Sangorrin's avatar Daniel Sangorrin Committed by Greg Kroah-Hartman
Browse files

USB: serial: ftdi: add CONTEC vendor and product id 



This is a patch to ftdi_sio_ids.h and ftdi_sio.c that adds identifiers for
CONTEC USB serial converter.  I tested it with the device COM-1(USB)H

[akpm@linux-foundation.org: keep the VIDs sorted a bit]
Signed-off-by: default avatarDaniel Sangorrin <daniel.sangorrin@gmail.com>
Cc: Andreas Mohr <andi@lisas.de>
Cc: Radek Liboska <liboska@uochb.cas.cz>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1d68064a

drivers/usb/serial/ftdi_sio.c

+1 −0
Original line number Diff line number Diff line
@@ -658,6 +658,7 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },

	{ USB_DEVICE(EVOLUTION_VID, EVO_HYBRID_PID) },

	{ USB_DEVICE(EVOLUTION_VID, EVO_RCM4_PID) },

	{ USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16C_PID) },

drivers/usb/serial/ftdi_sio_ids.h

+7 −0
Original line number Diff line number Diff line
@@ -500,6 +500,13 @@ 
#define CONTEC_VID		0x06CE	/* Vendor ID */

#define CONTEC_COM1USBH_PID	0x8311	/* COM-1(USB)H */



/*

 * Contec products (http://www.contec.com)

 * Submitted by Daniel Sangorrin

 */

#define CONTEC_VID		0x06CE	/* Vendor ID */

#define CONTEC_COM1USBH_PID	0x8311	/* COM-1(USB)H */



/*

 * Definitions for B&B Electronics products.

 */