Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[pandora-kernel.git] / drivers / usb / serial / ftdi_sio_ids.h

diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 15a4583..7dfe02f 100644 (file)
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -46,7 +46,7 @@
 #define FTDI_USINT_RS232_PID   0xb812  /* Navigator RS232 and CONFIG lines */
 
 /* OOCDlink by Joern Kaipf <joernk@web.de>
- * (http://www.joernonline.de/dw/doku.php?id=start&idx=projects:oocdlink) */
+ * (http://www.joernonline.de/) */
 #define FTDI_OOCDLINK_PID      0xbaf8  /* Amontec JTAGkey */
 
 /* Luminary Micro Stellaris Boards, VID = FTDI_VID */
@@ -61,6 +61,7 @@
 #define FTDI_OPENDCC_SNIFFER_PID       0xBFD9
 #define FTDI_OPENDCC_THROTTLE_PID      0xBFDA
 #define FTDI_OPENDCC_GATEWAY_PID       0xBFDB
+#define FTDI_OPENDCC_GBM_PID   0xBFDC
 
 /*
  * RR-CirKits LocoBuffer USB (http://www.rr-cirkits.com)
@@ -335,7 +336,7 @@
 #define FTDI_PIEGROUP_PID      0xF208  /* Product Id */
 
 /* ACT Solutions HomePro ZWave interface
-   (http://www.act-solutions.com/HomePro.htm) */
+   (http://www.act-solutions.com/HomePro-Product-Matrix.html) */
 #define FTDI_ACTZWAVE_PID      0xF2D0
 
 /*
@@ -366,7 +367,7 @@
 #define FTDI_SUUNTO_SPORTS_PID 0xF680  /* Suunto Sports instrument */
 
 /* USB-UIRT - An infrared receiver and transmitter using the 8U232AM chip */
-/* http://home.earthlink.net/~jrhees/USBUIRT/index.htm */
+/* http://www.usbuirt.com/ */
 #define FTDI_USB_UIRT_PID      0xF850  /* Product Id */
 
 /* CCS Inc. ICDU/ICDU40 product ID -
@@ -395,7 +396,7 @@
  */
 #define FTDI_HE_TIRA1_PID      0xFA78  /* Tira-1 IR transceiver */
 
-/* Inside Accesso contactless reader (http://www.insidefr.com) */
+/* Inside Accesso contactless reader (http://www.insidecontactless.com/) */
 #define INSIDE_ACCESSO         0xFAD0
 
 /*
@@ -634,14 +635,14 @@
 
 /*
  * JETI SPECTROMETER SPECBOS 1201
- * http://www.jeti.com/products/sys/scb/scb1201.php
+ * http://www.jeti.com/cms/index.php/instruments/other-instruments/specbos-2101
  */
 #define JETI_VID               0x0c6c
 #define JETI_SPC1201_PID       0x04b2
 
 /*
  * FTDI USB UART chips used in construction projects from the
- * Elektor Electronics magazine (http://elektor-electronics.co.uk)
+ * Elektor Electronics magazine (http://www.elektor.com/)
  */
 #define ELEKTOR_VID            0x0C7D
 #define ELEKTOR_FT323R_PID     0x0005  /* RFID-Reader, issue 09-2006 */
@@ -1022,9 +1023,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
@@ -1063,3 +1089,14 @@
  * Submitted by John G. Rogers
  */
 #define SEGWAY_RMP200_PID      0xe729
+
+
+/*
+ * Accesio USB Data Acquisition products (http://www.accesio.com/)
+ */
+#define ACCESIO_COM4SM_PID     0xD578
+
+/* www.sciencescope.co.uk educational dataloggers */
+#define FTDI_SCIENCESCOPE_LOGBOOKML_PID                0xFF18
+#define FTDI_SCIENCESCOPE_LS_LOGBOOK_PID       0xFF1C
+#define FTDI_SCIENCESCOPE_HS_LOGBOOK_PID       0xFF1D