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>

1 files changed, 29 insertions, 1 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 [] = {
         { 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) },
@@ -716,8 +715,37 @@ static struct usb_device_id id_table_combined [] = {
                 .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) },