diff options
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 6 | ||||
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.h | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index f2b4ca8692d8..c145e1ed8429 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
| @@ -469,8 +469,14 @@ static struct usb_device_id id_table_combined [] = { | |||
| 469 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) }, | 469 | { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) }, |
| 470 | { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) }, | 470 | { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) }, |
| 471 | { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) }, | 471 | { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) }, |
| 472 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) }, | ||
| 473 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_YS_PID) }, | ||
| 472 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) }, | 474 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) }, |
| 473 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) }, | 475 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) }, |
| 476 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_IC_PID) }, | ||
| 477 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_DB9_PID) }, | ||
| 478 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_RS232_PID) }, | ||
| 479 | { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y9_PID) }, | ||
| 474 | { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) }, | 480 | { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) }, |
| 475 | { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) }, | 481 | { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) }, |
| 476 | { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) }, | 482 | { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) }, |
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h index ca40f16370f1..bdef3b8c731f 100644 --- a/drivers/usb/serial/ftdi_sio.h +++ b/drivers/usb/serial/ftdi_sio.h | |||
| @@ -333,10 +333,18 @@ | |||
| 333 | 333 | ||
| 334 | /* | 334 | /* |
| 335 | * microHAM product IDs (http://www.microham.com). | 335 | * microHAM product IDs (http://www.microham.com). |
| 336 | * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>. | 336 | * Submitted by Justin Burket (KL1RL) <zorton@jtan.com> |
| 337 | * and Mike Studer (K6EEP) <k6eep@hamsoftware.org>. | ||
| 338 | * Ian Abbott <abbotti@mev.co.uk> added a few more from the driver INF file. | ||
| 337 | */ | 339 | */ |
| 340 | #define FTDI_MHAM_KW_PID 0xEEE8 /* USB-KW interface */ | ||
| 341 | #define FTDI_MHAM_YS_PID 0xEEE9 /* USB-YS interface */ | ||
| 338 | #define FTDI_MHAM_Y6_PID 0xEEEA /* USB-Y6 interface */ | 342 | #define FTDI_MHAM_Y6_PID 0xEEEA /* USB-Y6 interface */ |
| 339 | #define FTDI_MHAM_Y8_PID 0xEEEB /* USB-Y8 interface */ | 343 | #define FTDI_MHAM_Y8_PID 0xEEEB /* USB-Y8 interface */ |
| 344 | #define FTDI_MHAM_IC_PID 0xEEEC /* USB-IC interface */ | ||
| 345 | #define FTDI_MHAM_DB9_PID 0xEEED /* USB-DB9 interface */ | ||
| 346 | #define FTDI_MHAM_RS232_PID 0xEEEE /* USB-RS232 interface */ | ||
| 347 | #define FTDI_MHAM_Y9_PID 0xEEEF /* USB-Y9 interface */ | ||
| 340 | 348 | ||
| 341 | /* | 349 | /* |
| 342 | * Active Robots product ids. | 350 | * Active Robots product ids. |
