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

Commit 9b1513d9 authored by Ian Abbott's avatar Ian Abbott Committed by Linus Torvalds
Browse files

[PATCH] USB: ftdi_sio: new microHAM and Evolution Robotics devices 



The attached patch adds the following new devices to the ftdi_sio driver:

* microHAM USB-Y6 and USB-Y8 devices submitted by Justin Burket (KL1RL).
* Evolution Robotics ER1 Control Module submitted by Shawn M.  Lavelle.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a46e8126

drivers/usb/serial/ftdi_sio.c

+3 −0
Original line number Diff line number Diff line
@@ -429,6 +429,9 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID) },

	{ USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },

	{ 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(EVOLUTION_VID, EVOLUTION_ER1_PID) },

	{ }						/* Terminating entry */

};

drivers/usb/serial/ftdi_sio.h

+14 −0
Original line number Diff line number Diff line
@@ -264,11 +264,25 @@ 
#define MOBILITY_VID			0x1342

#define MOBILITY_USB_SERIAL_PID		0x0202	/* EasiDock USB 200 serial */



/*

 * microHAM product IDs (http://www.microham.com).

 * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>.

 */

#define FTDI_MHAM_Y6_PID 0xEEEA		/* USB-Y6 interface */

#define FTDI_MHAM_Y8_PID 0xEEEB		/* USB-Y8 interface */



/*

 * Active Robots product ids.

 */

#define FTDI_ACTIVE_ROBOTS_PID	0xE548	/* USB comms board */



/*

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

 * Submitted by Shawn M. Lavelle.

 */

#define EVOLUTION_VID		0xDEEE	/* Vendor ID */

#define EVOLUTION_ER1_PID	0x0300	/* ER1 Control Module */



/* Commands */

#define FTDI_SIO_RESET 		0 /* Reset the port */

#define FTDI_SIO_MODEM_CTRL 	1 /* Set the modem control register */