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

Commit 740a4282 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: ftdi_sio: new IDs for Teratronik devices 



This patch adds vendor and product IDs to the ftdi_sio driver's device
ID table for two devices from teratronik.de.  The device IDs were
submitted by O. Wölfelschneider of Teratronik Elektronische Systeme
GmbH.

The charset of the patch is latin-1, same as the original files.

Please apply, thanks!  (I've tried to avoid a clash with Andrew Morton's
patch to add support for Posiflex PP-7700 printer to the same driver.)

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent effac8be

drivers/usb/serial/ftdi_sio.c

+2 −0
Original line number Diff line number Diff line
@@ -471,6 +471,8 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) },

	{ USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ARTEMIS_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_ATIK_ATK16_PID) },

drivers/usb/serial/ftdi_sio.h

+7 −0
Original line number Diff line number Diff line
@@ -342,6 +342,13 @@ 
#define XSENS_CONVERTER_6_PID	0xD38E

#define XSENS_CONVERTER_7_PID	0xD38F



/*

 * Teratronik product ids.

 * Submitted by O. Wlfelschneider.

 */

#define FTDI_TERATRONIK_VCP_PID	 0xEC88	/* Teratronik device (preferring VCP driver on windows) */

#define FTDI_TERATRONIK_D2XX_PID 0xEC89	/* Teratronik device (preferring D2XX driver on windows) */



/*

 * Evolution Robotics products (http://www.evolution.com/).

 * Submitted by Shawn M. Lavelle.