]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] USB: ftdi_sio: new microHAM and Evolution Robotics devices
authorIan Abbott <abbotti@mev.co.uk>
Fri, 29 Jul 2005 19:16:31 +0000 (12:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 29 Jul 2005 20:12:52 +0000 (13:12 -0700)
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: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/ftdi_sio.h

index 0b03ddab53d9e9e325dfaaed918630f7e9b194e9..cfb77ceced58d0200187a320de3152a996cba085 100644 (file)
@@ -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 */
 };
 
index 8866376823a5fd90eca435e80d0062b83e5de5ff..9f4342093e8b11eacbe00e49f81f28e79edf25ca 100644 (file)
 #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 */