| From 59c6ccd9f9aecfa59c99ceba6d4d34b180547a05 Mon Sep 17 00:00:00 2001 |
| From: Daniel Suchy <danny@danysek.cz> |
| Date: Tue, 12 Oct 2010 15:44:24 +0200 |
| Subject: USB: ftdi_sio: new VID/PIDs for various Papouch devices |
| |
| From: Daniel Suchy <danny@danysek.cz> |
| |
| commit 59c6ccd9f9aecfa59c99ceba6d4d34b180547a05 upstream. |
| |
| This patch for FTDI USB serial driver ads new VID/PIDs used on various |
| devices manufactured by Papouch (http://www.papouch.com). These devices |
| have their own VID/PID, although they're using standard FTDI chip. In |
| ftdi_sio.c, I also made small cleanup to have declarations for all |
| Papouch devices together. |
| |
| Signed-off-by: Daniel Suchy <danny@danysek.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/usb/serial/ftdi_sio.c | 30 +++++++++++++++++++++++++++++- |
| drivers/usb/serial/ftdi_sio_ids.h | 27 ++++++++++++++++++++++++++- |
| 2 files changed, 55 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/usb/serial/ftdi_sio.c |
| +++ b/drivers/usb/serial/ftdi_sio.c |
| @@ -681,7 +681,6 @@ static struct usb_device_id id_table_com |
| { USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) }, |
| { USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) }, |
| { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) }, |
| - { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) }, |
| { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) }, |
| { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) }, |
| { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) }, |
| @@ -722,8 +721,37 @@ static struct usb_device_id id_table_com |
| .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
| { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, |
| { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) }, |
| + |
| + /* Papouch devices based on FTDI chip */ |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_AP485_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB422_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485_2_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_AP485_2_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB422_2_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485S_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485C_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_LEC_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB232_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_IRAMP_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_DRAK5_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO8x8_PID) }, |
| { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO2x2_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO10x1_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO30x3_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO60x3_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO2x16_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO3x32_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_DRAK6_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_UPSUSB_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_MU_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SIMUKEY_PID) }, |
| { USB_DEVICE(PAPOUCH_VID, PAPOUCH_AD4USB_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_GMUX_PID) }, |
| + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_GMSR_PID) }, |
| + |
| { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) }, |
| { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) }, |
| { USB_DEVICE(ALTI2_VID, ALTI2_N3_PID) }, |
| --- a/drivers/usb/serial/ftdi_sio_ids.h |
| +++ b/drivers/usb/serial/ftdi_sio_ids.h |
| @@ -1030,9 +1030,34 @@ |
| */ |
| |
| #define PAPOUCH_VID 0x5050 /* Vendor ID */ |
| +#define PAPOUCH_SB485_PID 0x0100 /* Papouch SB485 USB-485/422 Converter */ |
| +#define PAPOUCH_AP485_PID 0x0101 /* AP485 USB-RS485 Converter */ |
| +#define PAPOUCH_SB422_PID 0x0102 /* Papouch SB422 USB-RS422 Converter */ |
| +#define PAPOUCH_SB485_2_PID 0x0103 /* Papouch SB485 USB-485/422 Converter */ |
| +#define PAPOUCH_AP485_2_PID 0x0104 /* AP485 USB-RS485 Converter */ |
| +#define PAPOUCH_SB422_2_PID 0x0105 /* Papouch SB422 USB-RS422 Converter */ |
| +#define PAPOUCH_SB485S_PID 0x0106 /* Papouch SB485S USB-485/422 Converter */ |
| +#define PAPOUCH_SB485C_PID 0x0107 /* Papouch SB485C USB-485/422 Converter */ |
| +#define PAPOUCH_LEC_PID 0x0300 /* LEC USB Converter */ |
| +#define PAPOUCH_SB232_PID 0x0301 /* Papouch SB232 USB-RS232 Converter */ |
| #define PAPOUCH_TMU_PID 0x0400 /* TMU USB Thermometer */ |
| -#define PAPOUCH_QUIDO4x4_PID 0x0900 /* Quido 4/4 Module */ |
| +#define PAPOUCH_IRAMP_PID 0x0500 /* Papouch IRAmp Duplex */ |
| +#define PAPOUCH_DRAK5_PID 0x0700 /* Papouch DRAK5 */ |
| +#define PAPOUCH_QUIDO8x8_PID 0x0800 /* Papouch Quido 8/8 Module */ |
| +#define PAPOUCH_QUIDO4x4_PID 0x0900 /* Papouch Quido 4/4 Module */ |
| +#define PAPOUCH_QUIDO2x2_PID 0x0a00 /* Papouch Quido 2/2 Module */ |
| +#define PAPOUCH_QUIDO10x1_PID 0x0b00 /* Papouch Quido 10/1 Module */ |
| +#define PAPOUCH_QUIDO30x3_PID 0x0c00 /* Papouch Quido 30/3 Module */ |
| +#define PAPOUCH_QUIDO60x3_PID 0x0d00 /* Papouch Quido 60(100)/3 Module */ |
| +#define PAPOUCH_QUIDO2x16_PID 0x0e00 /* Papouch Quido 2/16 Module */ |
| +#define PAPOUCH_QUIDO3x32_PID 0x0f00 /* Papouch Quido 3/32 Module */ |
| +#define PAPOUCH_DRAK6_PID 0x1000 /* Papouch DRAK6 */ |
| +#define PAPOUCH_UPSUSB_PID 0x8000 /* Papouch UPS-USB adapter */ |
| +#define PAPOUCH_MU_PID 0x8001 /* MU controller */ |
| +#define PAPOUCH_SIMUKEY_PID 0x8002 /* Papouch SimuKey */ |
| #define PAPOUCH_AD4USB_PID 0x8003 /* AD4USB Measurement Module */ |
| +#define PAPOUCH_GMUX_PID 0x8004 /* Papouch GOLIATH MUX */ |
| +#define PAPOUCH_GMSR_PID 0x8005 /* Papouch GOLIATH MSR */ |
| |
| /* |
| * Marvell SheevaPlug |