3 files changed, 18 insertions, 6 deletions

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 4c53236f9baf..793479495f66 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -188,6 +188,7 @@ static struct usb_device_id id_table_combined [] = {
                 .driver_info = (kernel_ulong_t)&ftdi_8u2232c_quirk },
         { USB_DEVICE(FTDI_VID, FTDI_4232H_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_232H_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_FTX_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_MICRO_CHAMELEON_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_RELAIS_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_PID) },
@@ -873,7 +874,8 @@ static const char *ftdi_chip_name[] = {
         [FT232RL] = "FT232RL",
         [FT2232H] = "FT2232H",
         [FT4232H] = "FT4232H",
-        [FT232H]  = "FT232H"
+        [FT232H]  = "FT232H",
+        [FTX]     = "FT-X"
 };
 
 
@@ -1177,7 +1179,8 @@ static __u32 get_ftdi_divisor(struct tty_struct *tty,
                 break;
         case FT232BM: /* FT232BM chip */
         case FT2232C: /* FT2232C chip */
-        case FT232RL:
+        case FT232RL: /* FT232RL chip */
+        case FTX:     /* FT-X series */
                 if (baud <= 3000000) {
                         __u16 product_id = le16_to_cpu(
                                 port->serial->dev->descriptor.idProduct);
@@ -1466,10 +1469,14 @@ static void ftdi_determine_type(struct usb_serial_port *port)
         } else if (version < 0x900) {
                 /* Assume it's an FT232RL */
                 priv->chip_type = FT232RL;
-        } else {
+        } else if (version < 0x1000) {
                 /* Assume it's an FT232H */
                 priv->chip_type = FT232H;
+        } else {
+                /* Assume it's an FT-X series device */
+                priv->chip_type = FTX;
         }
+
         dev_info(&udev->dev, "Detected %s\n", ftdi_chip_name[priv->chip_type]);
 }
 
@@ -1597,7 +1604,8 @@ static int create_sysfs_attrs(struct usb_serial_port *port)
                      priv->chip_type == FT232RL ||
                      priv->chip_type == FT2232H ||
                      priv->chip_type == FT4232H ||
-                     priv->chip_type == FT232H)) {
+                     priv->chip_type == FT232H ||
+                     priv->chip_type == FTX)) {
                         retval = device_create_file(&port->dev,
                                                     &dev_attr_latency_timer);
                 }
@@ -1619,7 +1627,8 @@ static void remove_sysfs_attrs(struct usb_serial_port *port)
                     priv->chip_type == FT232RL ||
                     priv->chip_type == FT2232H ||
                     priv->chip_type == FT4232H ||
-                    priv->chip_type == FT232H) {
+                    priv->chip_type == FT232H ||
+                    priv->chip_type == FTX) {
                         device_remove_file(&port->dev, &dev_attr_latency_timer);
                 }
         }
@@ -2297,6 +2306,7 @@ static int ftdi_tiocmget(struct tty_struct *tty)
         case FT2232H:
         case FT4232H:
         case FT232H:
+        case FTX:
                 len = 2;
                 break;
         default:
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index 19584faa86f9..ed58c6fa8dbe 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -157,7 +157,8 @@ enum ftdi_chip_type {
         FT232RL = 5,
         FT2232H = 6,
         FT4232H = 7,
-        FT232H  = 8
+        FT232H  = 8,
+        FTX     = 9,
 };
 
 enum ftdi_sio_baudrate {
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index ae55ca8a199b..37d783a2e789 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -23,6 +23,7 @@
 #define FTDI_8U2232C_PID 0x6010 /* Dual channel device */
 #define FTDI_4232H_PID 0x6011 /* Quad channel hi-speed device */
 #define FTDI_232H_PID  0x6014 /* Single channel hi-speed device */
+#define FTDI_FTX_PID   0x6015 /* FT-X series (FT201X, FT230X, FT231X, etc) */
 #define FTDI_SIO_PID    0x8372  /* Product Id SIO application of 8U100AX */
 #define FTDI_232RL_PID  0xFBFA  /* Product ID for FT232RL */