4 files changed, 32 insertions, 27 deletions

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 3ce5c74b29e4..c3119eb251bc 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -58,9 +58,11 @@ config USB_SERIAL_SIMPLE
           handles a wide range of very simple devices, all in one
           driver.  Specifically, it supports:
                 - Suunto ANT+ USB device.
+                - Medtronic CareLink USB device
                 - Fundamental Software dongle.
                 - HP4x calculators
                 - a number of Motorola phones
+                - Novatel Wireless GPS receivers
                 - Siemens USB/MPI adapter.
                 - ViVOtech ViVOpay USB device.
                 - Infineon Modem Flashloader USB interface
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index e9bad928039f..0f872e6b2c87 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -162,6 +162,9 @@ static const struct pl2303_type_data pl2303_type_data[TYPE_COUNT] = {
                 .max_baud_rate =        1228800,
                 .quirks =               PL2303_QUIRK_LEGACY,
         },
+        [TYPE_HX] = {
+                .max_baud_rate =        12000000,
+        },
 };
 
 static int pl2303_vendor_read(struct usb_serial *serial, u16 value,
@@ -395,16 +398,14 @@ static void pl2303_encode_baud_rate(struct tty_struct *tty,
         if (spriv->type->max_baud_rate)
                 baud = min_t(speed_t, baud, spriv->type->max_baud_rate);
         /*
-         * Set baud rate to nearest supported value.
-         *
-         * NOTE: Baud rate 500k can only be set using divisors.
+         * Use direct method for supported baud rates, otherwise use divisors.
          */
         baud_sup = pl2303_get_supported_baud_rate(baud);
 
-        if (baud == 500000)
-                baud = pl2303_encode_baud_rate_divisor(buf, baud);
+        if (baud == baud_sup)
+                baud = pl2303_encode_baud_rate_direct(buf, baud);
         else
-                baud = pl2303_encode_baud_rate_direct(buf, baud_sup);
+                baud = pl2303_encode_baud_rate_divisor(buf, baud);
 
         /* Save resulting baud rate */
         tty_encode_baud_rate(tty, baud, baud);
diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c
index fb79775447b0..7064eb8d6142 100644
--- a/drivers/usb/serial/usb-serial-simple.c
+++ b/drivers/usb/serial/usb-serial-simple.c
@@ -20,7 +20,7 @@
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
-#define DEVICE(vendor, IDS)                                     \
+#define DEVICE_N(vendor, IDS, nport)                            \
 static const struct usb_device_id vendor##_id_table[] = {       \
         IDS(),                                                  \
         { },                                                    \
@@ -31,9 +31,15 @@ static struct usb_serial_driver vendor##_device = {		\
                 .name =         #vendor,                        \
         },                                                      \
         .id_table =             vendor##_id_table,              \
-        .num_ports =            1,                              \
+        .num_ports =            nport,                          \
 };
 
+#define DEVICE(vendor, IDS)     DEVICE_N(vendor, IDS, 1)
+
+/* Medtronic CareLink USB driver */
+#define CARELINK_IDS()                  \
+        { USB_DEVICE(0x0a21, 0x8001) }  /* MMT-7305WW */
+DEVICE(carelink, CARELINK_IDS);
 
 /* ZIO Motherboard USB driver */
 #define ZIO_IDS()                       \
@@ -64,6 +70,11 @@ DEVICE(vivopay, VIVOPAY_IDS);
         { USB_DEVICE(0x22b8, 0x2c64) }  /* Motorola V950 phone */
 DEVICE(moto_modem, MOTO_IDS);
 
+/* Novatel Wireless GPS driver */
+#define NOVATEL_IDS()                   \
+        { USB_DEVICE(0x09d7, 0x0100) }  /* NovAtel FlexPack GPS */
+DEVICE_N(novatel_gps, NOVATEL_IDS, 3);
+
 /* HP4x (48/49) Generic Serial driver */
 #define HP4X_IDS()                      \
         { USB_DEVICE(0x03f0, 0x0121) }
@@ -82,11 +93,13 @@ DEVICE(siemens_mpi, SIEMENS_IDS);
 
 /* All of the above structures mushed into two lists */
 static struct usb_serial_driver * const serial_drivers[] = {
+        &carelink_device,
         &zio_device,
         &funsoft_device,
         &flashloader_device,
         &vivopay_device,
         &moto_modem_device,
+        &novatel_gps_device,
         &hp4x_device,
         &suunto_device,
         &siemens_mpi_device,
@@ -94,11 +107,13 @@ static struct usb_serial_driver * const serial_drivers[] = {
 };
 
 static const struct usb_device_id id_table[] = {
+        CARELINK_IDS(),
         ZIO_IDS(),
         FUNSOFT_IDS(),
         FLASHLOADER_IDS(),
         VIVOPAY_IDS(),
         MOTO_IDS(),
+        NOVATEL_IDS(),
         HP4X_IDS(),
         SUUNTO_IDS(),
         SIEMENS_IDS(),
diff --git a/drivers/usb/serial/xsens_mt.c b/drivers/usb/serial/xsens_mt.c
index 4841fb57400c..3837d5113bb2 100644
--- a/drivers/usb/serial/xsens_mt.c
+++ b/drivers/usb/serial/xsens_mt.c
@@ -41,28 +41,13 @@ static const struct usb_device_id id_table[] = {
 };
 MODULE_DEVICE_TABLE(usb, id_table);
 
-static int has_required_endpoints(const struct usb_host_interface *interface)
-{
-        __u8 i;
-        int has_bulk_in = 0;
-        int has_bulk_out = 0;
-
-        for (i = 0; i < interface->desc.bNumEndpoints; ++i) {
-                if (usb_endpoint_is_bulk_in(&interface->endpoint[i].desc))
-                        has_bulk_in = 1;
-                else if (usb_endpoint_is_bulk_out(&interface->endpoint[i].desc))
-                        has_bulk_out = 1;
-        }
-
-        return has_bulk_in && has_bulk_out;
-}
-
 static int xsens_mt_probe(struct usb_serial *serial,
                                         const struct usb_device_id *id)
 {
-        if (!has_required_endpoints(serial->interface->cur_altsetting))
-                return -ENODEV;
-        return 0;
+        if (serial->interface->cur_altsetting->desc.bInterfaceNumber == 1)
+                return 0;
+
+        return -ENODEV;
 }
 
 static struct usb_serial_driver xsens_mt_device = {
@@ -82,4 +67,6 @@ static struct usb_serial_driver * const serial_drivers[] = {
 
 module_usb_serial_driver(serial_drivers, id_table);
 
+MODULE_AUTHOR("Frans Klaver <frans.klaver@xsens.com>");
+MODULE_DESCRIPTION("USB-serial driver for Xsens motion trackers");
 MODULE_LICENSE("GPL");