releases/2.6.35.9/usb-ftdi_sio-new-vid-pids-for-various-papouch-devices.patch

   1 From 59c6ccd9f9aecfa59c99ceba6d4d34b180547a05 Mon Sep 17 00:00:00 2001
   2 From: Daniel Suchy <danny@danysek.cz>
   3 Date: Tue, 12 Oct 2010 15:44:24 +0200
   4 Subject: USB: ftdi_sio: new VID/PIDs for various Papouch devices
   5
   6 From: Daniel Suchy <danny@danysek.cz>
   7
   8 commit 59c6ccd9f9aecfa59c99ceba6d4d34b180547a05 upstream.
   9
  10 This patch for FTDI USB serial driver ads new VID/PIDs used on various
  11 devices manufactured by Papouch (http://www.papouch.com). These devices
  12 have their own VID/PID, although they're using standard FTDI chip. In
  13 ftdi_sio.c, I also made small cleanup to have declarations for all
  14 Papouch devices together.
  15
  16 Signed-off-by: Daniel Suchy <danny@danysek.cz>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  18
  19 ---
  20  drivers/usb/serial/ftdi_sio.c     |   30 +++++++++++++++++++++++++++++-
  21  drivers/usb/serial/ftdi_sio_ids.h |   27 ++++++++++++++++++++++++++-
  22  2 files changed, 55 insertions(+), 2 deletions(-)
  23
  24 --- a/drivers/usb/serial/ftdi_sio.c
  25 +++ b/drivers/usb/serial/ftdi_sio.c
  26 @@ -675,7 +675,6 @@ static struct usb_device_id id_table_com
  27         { USB_DEVICE(FTDI_VID, FTDI_RRCIRKITS_LOCOBUFFER_PID) },
  28         { USB_DEVICE(FTDI_VID, FTDI_ASK_RDR400_PID) },
  29         { USB_DEVICE(ICOM_ID1_VID, ICOM_ID1_PID) },
  30 -       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
  31         { USB_DEVICE(FTDI_VID, FTDI_ACG_HFDUAL_PID) },
  32         { USB_DEVICE(FTDI_VID, FTDI_YEI_SERVOCENTER31_PID) },
  33         { USB_DEVICE(FTDI_VID, FTDI_THORLABS_PID) },
  34 @@ -716,8 +715,37 @@ static struct usb_device_id id_table_com
  35                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
  36         { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
  37         { USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) },
  38 +
  39 +       /* Papouch devices based on FTDI chip */
  40 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485_PID) },
  41 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_AP485_PID) },
  42 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB422_PID) },
  43 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485_2_PID) },
  44 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_AP485_2_PID) },
  45 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB422_2_PID) },
  46 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485S_PID) },
  47 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB485C_PID) },
  48 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_LEC_PID) },
  49 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SB232_PID) },
  50 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
  51 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_IRAMP_PID) },
  52 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_DRAK5_PID) },
  53 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO8x8_PID) },
  54         { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) },
  55 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO2x2_PID) },
  56 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO10x1_PID) },
  57 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO30x3_PID) },
  58 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO60x3_PID) },
  59 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO2x16_PID) },
  60 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO3x32_PID) },
  61 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_DRAK6_PID) },
  62 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_UPSUSB_PID) },
  63 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_MU_PID) },
  64 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_SIMUKEY_PID) },
  65         { USB_DEVICE(PAPOUCH_VID, PAPOUCH_AD4USB_PID) },
  66 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_GMUX_PID) },
  67 +       { USB_DEVICE(PAPOUCH_VID, PAPOUCH_GMSR_PID) },
  68 +
  69         { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) },
  70         { USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) },
  71         { USB_DEVICE(ALTI2_VID, ALTI2_N3_PID) },
  72 --- a/drivers/usb/serial/ftdi_sio_ids.h
  73 +++ b/drivers/usb/serial/ftdi_sio_ids.h
  74 @@ -1023,9 +1023,34 @@
  75   */
  76
  77  #define PAPOUCH_VID                    0x5050  /* Vendor ID */
  78 +#define PAPOUCH_SB485_PID              0x0100  /* Papouch SB485 USB-485/422 Converter */
  79 +#define PAPOUCH_AP485_PID              0x0101  /* AP485 USB-RS485 Converter */
  80 +#define PAPOUCH_SB422_PID              0x0102  /* Papouch SB422 USB-RS422 Converter  */
  81 +#define PAPOUCH_SB485_2_PID            0x0103  /* Papouch SB485 USB-485/422 Converter */
  82 +#define PAPOUCH_AP485_2_PID            0x0104  /* AP485 USB-RS485 Converter */
  83 +#define PAPOUCH_SB422_2_PID            0x0105  /* Papouch SB422 USB-RS422 Converter  */
  84 +#define PAPOUCH_SB485S_PID             0x0106  /* Papouch SB485S USB-485/422 Converter */
  85 +#define PAPOUCH_SB485C_PID             0x0107  /* Papouch SB485C USB-485/422 Converter */
  86 +#define PAPOUCH_LEC_PID                        0x0300  /* LEC USB Converter */
  87 +#define PAPOUCH_SB232_PID              0x0301  /* Papouch SB232 USB-RS232 Converter */
  88  #define PAPOUCH_TMU_PID                        0x0400  /* TMU USB Thermometer */
  89 -#define PAPOUCH_QUIDO4x4_PID           0x0900  /* Quido 4/4 Module */
  90 +#define PAPOUCH_IRAMP_PID              0x0500  /* Papouch IRAmp Duplex */
  91 +#define PAPOUCH_DRAK5_PID              0x0700  /* Papouch DRAK5 */
  92 +#define PAPOUCH_QUIDO8x8_PID           0x0800  /* Papouch Quido 8/8 Module */
  93 +#define PAPOUCH_QUIDO4x4_PID           0x0900  /* Papouch Quido 4/4 Module */
  94 +#define PAPOUCH_QUIDO2x2_PID           0x0a00  /* Papouch Quido 2/2 Module */
  95 +#define PAPOUCH_QUIDO10x1_PID          0x0b00  /* Papouch Quido 10/1 Module */
  96 +#define PAPOUCH_QUIDO30x3_PID          0x0c00  /* Papouch Quido 30/3 Module */
  97 +#define PAPOUCH_QUIDO60x3_PID          0x0d00  /* Papouch Quido 60(100)/3 Module */
  98 +#define PAPOUCH_QUIDO2x16_PID          0x0e00  /* Papouch Quido 2/16 Module */
  99 +#define PAPOUCH_QUIDO3x32_PID          0x0f00  /* Papouch Quido 3/32 Module */
 100 +#define PAPOUCH_DRAK6_PID              0x1000  /* Papouch DRAK6 */
 101 +#define PAPOUCH_UPSUSB_PID             0x8000  /* Papouch UPS-USB adapter */
 102 +#define PAPOUCH_MU_PID                 0x8001  /* MU controller */
 103 +#define PAPOUCH_SIMUKEY_PID            0x8002  /* Papouch SimuKey */
 104  #define PAPOUCH_AD4USB_PID             0x8003  /* AD4USB Measurement Module */
 105 +#define PAPOUCH_GMUX_PID               0x8004  /* Papouch GOLIATH MUX */
 106 +#define PAPOUCH_GMSR_PID               0x8005  /* Papouch GOLIATH MSR */
 107
 108  /*
 109   * Marvell SheevaPlug