diff options
author | Daniel Suchy <danny@danysek.cz> | 2010-10-12 09:44:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-22 13:22:08 -0400 |
commit | 59c6ccd9f9aecfa59c99ceba6d4d34b180547a05 (patch) | |
tree | 12ab3ec79b0161413320df1af34f29ed174c1f55 /drivers | |
parent | 562e7c71c6708353bfe7b615576bcbcf7afd522e (diff) |
USB: ftdi_sio: new VID/PIDs for various Papouch devices
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>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 30 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio_ids.h | 27 |
2 files changed, 55 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index e128f9125f71..89284df2f8d9 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -675,7 +675,6 @@ static struct usb_device_id id_table_combined [] = { | |||
675 | { USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) }, | 675 | { USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) }, |
676 | { USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) }, | 676 | { USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) }, |
677 | { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) }, | 677 | { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) }, |
678 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) }, | ||
679 | { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) }, | 678 | { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) }, |
680 | { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) }, | 679 | { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) }, |
681 | { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) }, | 680 | { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) }, |
@@ -716,8 +715,37 @@ static struct usb_device_id id_table_combined [] = { | |||
716 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, | 715 | .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, |
717 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, | 716 | { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) }, |
718 | { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) }, | 717 | { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) }, |
718 | |||
719 | /* Papouch devices based on FTDI chip */ | ||
720 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485_PID) }, | ||
721 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_AP485_PID) }, | ||
722 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB422_PID) }, | ||
723 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485_2_PID) }, | ||
724 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_AP485_2_PID) }, | ||
725 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB422_2_PID) }, | ||
726 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485S_PID) }, | ||
727 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485C_PID) }, | ||
728 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_LEC_PID) }, | ||
729 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB232_PID) }, | ||
730 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) }, | ||
731 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_IRAMP_PID) }, | ||
732 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_DRAK5_PID) }, | ||
733 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO8x8_PID) }, | ||
719 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) }, | 734 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) }, |
735 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO2x2_PID) }, | ||
736 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO10x1_PID) }, | ||
737 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO30x3_PID) }, | ||
738 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO60x3_PID) }, | ||
739 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO2x16_PID) }, | ||
740 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO3x32_PID) }, | ||
741 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_DRAK6_PID) }, | ||
742 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_UPSUSB_PID) }, | ||
743 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_MU_PID) }, | ||
744 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SIMUKEY_PID) }, | ||
720 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_AD4USB_PID) }, | 745 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_AD4USB_PID) }, |
746 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_GMUX_PID) }, | ||
747 | { USB_DEVICE(PAPOUCH_VID, PAPOUCH_GMSR_PID) }, | ||
748 | |||
721 | { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) }, | 749 | { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) }, |
722 | { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) }, | 750 | { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) }, |
723 | { USB_DEVICE(ALTI2_VID, ALTI2_N3_PID) }, | 751 | { USB_DEVICE(ALTI2_VID, ALTI2_N3_PID) }, |
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 517d01435abb..fc44369ec1a6 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h | |||
@@ -1023,9 +1023,34 @@ | |||
1023 | */ | 1023 | */ |
1024 | 1024 | ||
1025 | #define PAPOUCH_VID 0x5050 /* Vendor ID */ | 1025 | #define PAPOUCH_VID 0x5050 /* Vendor ID */ |
1026 | #define PAPOUCH_SB485_PID 0x0100 /* Papouch SB485 USB-485/422 Converter */ | ||
1027 | #define PAPOUCH_AP485_PID 0x0101 /* AP485 USB-RS485 Converter */ | ||
1028 | #define PAPOUCH_SB422_PID 0x0102 /* Papouch SB422 USB-RS422 Converter */ | ||
1029 | #define PAPOUCH_SB485_2_PID 0x0103 /* Papouch SB485 USB-485/422 Converter */ | ||
1030 | #define PAPOUCH_AP485_2_PID 0x0104 /* AP485 USB-RS485 Converter */ | ||
1031 | #define PAPOUCH_SB422_2_PID 0x0105 /* Papouch SB422 USB-RS422 Converter */ | ||
1032 | #define PAPOUCH_SB485S_PID 0x0106 /* Papouch SB485S USB-485/422 Converter */ | ||
1033 | #define PAPOUCH_SB485C_PID 0x0107 /* Papouch SB485C USB-485/422 Converter */ | ||
1034 | #define PAPOUCH_LEC_PID 0x0300 /* LEC USB Converter */ | ||
1035 | #define PAPOUCH_SB232_PID 0x0301 /* Papouch SB232 USB-RS232 Converter */ | ||
1026 | #define PAPOUCH_TMU_PID 0x0400 /* TMU USB Thermometer */ | 1036 | #define PAPOUCH_TMU_PID 0x0400 /* TMU USB Thermometer */ |
1027 | #define PAPOUCH_QUIDO4x4_PID 0x0900 /* Quido 4/4 Module */ | 1037 | #define PAPOUCH_IRAMP_PID 0x0500 /* Papouch IRAmp Duplex */ |
1038 | #define PAPOUCH_DRAK5_PID 0x0700 /* Papouch DRAK5 */ | ||
1039 | #define PAPOUCH_QUIDO8x8_PID 0x0800 /* Papouch Quido 8/8 Module */ | ||
1040 | #define PAPOUCH_QUIDO4x4_PID 0x0900 /* Papouch Quido 4/4 Module */ | ||
1041 | #define PAPOUCH_QUIDO2x2_PID 0x0a00 /* Papouch Quido 2/2 Module */ | ||
1042 | #define PAPOUCH_QUIDO10x1_PID 0x0b00 /* Papouch Quido 10/1 Module */ | ||
1043 | #define PAPOUCH_QUIDO30x3_PID 0x0c00 /* Papouch Quido 30/3 Module */ | ||
1044 | #define PAPOUCH_QUIDO60x3_PID 0x0d00 /* Papouch Quido 60(100)/3 Module */ | ||
1045 | #define PAPOUCH_QUIDO2x16_PID 0x0e00 /* Papouch Quido 2/16 Module */ | ||
1046 | #define PAPOUCH_QUIDO3x32_PID 0x0f00 /* Papouch Quido 3/32 Module */ | ||
1047 | #define PAPOUCH_DRAK6_PID 0x1000 /* Papouch DRAK6 */ | ||
1048 | #define PAPOUCH_UPSUSB_PID 0x8000 /* Papouch UPS-USB adapter */ | ||
1049 | #define PAPOUCH_MU_PID 0x8001 /* MU controller */ | ||
1050 | #define PAPOUCH_SIMUKEY_PID 0x8002 /* Papouch SimuKey */ | ||
1028 | #define PAPOUCH_AD4USB_PID 0x8003 /* AD4USB Measurement Module */ | 1051 | #define PAPOUCH_AD4USB_PID 0x8003 /* AD4USB Measurement Module */ |
1052 | #define PAPOUCH_GMUX_PID 0x8004 /* Papouch GOLIATH MUX */ | ||
1053 | #define PAPOUCH_GMSR_PID 0x8005 /* Papouch GOLIATH MSR */ | ||
1029 | 1054 | ||
1030 | /* | 1055 | /* |
1031 | * Marvell SheevaPlug | 1056 | * Marvell SheevaPlug |