11 files changed, 402 insertions, 31 deletions

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 916b2b6d765f..95058109f9fa 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -527,6 +527,15 @@ config USB_SERIAL_SAFE_PADDED
         bool "USB Secure Encapsulated Driver - Padded"
         depends on USB_SERIAL_SAFE
 
+config USB_SERIAL_SAMBA
+        tristate "USB Atmel SAM Boot Assistant (SAM-BA) driver"
+        help
+          Say Y here if you want to access the SAM-BA boot application of an
+          Atmel AT91SAM device.
+
+          To compile this driver as a module, choose M here: the
+          module will be called sam-ba.
+
 config USB_SERIAL_SIEMENS_MPI
         tristate "USB Siemens MPI driver"
         help
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 40ebe17b6ea8..9a2117f2b06e 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -6,10 +6,10 @@
 
 obj-$(CONFIG_USB_SERIAL)                        += usbserial.o
 
-usbserial-obj-$(CONFIG_USB_SERIAL_CONSOLE)      += console.o
-usbserial-obj-$(CONFIG_USB_EZUSB)               += ezusb.o
+usbserial-y := usb-serial.o generic.o bus.o
 
-usbserial-objs  := usb-serial.o generic.o bus.o $(usbserial-obj-y)
+usbserial-$(CONFIG_USB_SERIAL_CONSOLE)  += console.o
+usbserial-$(CONFIG_USB_EZUSB)           += ezusb.o
 
 obj-$(CONFIG_USB_SERIAL_AIRCABLE)               += aircable.o
 obj-$(CONFIG_USB_SERIAL_ARK3116)                += ark3116.o
@@ -48,6 +48,7 @@ obj-$(CONFIG_USB_SERIAL_PL2303)			+= pl2303.o
 obj-$(CONFIG_USB_SERIAL_QCAUX)                  += qcaux.o
 obj-$(CONFIG_USB_SERIAL_QUALCOMM)               += qcserial.o
 obj-$(CONFIG_USB_SERIAL_SAFE)                   += safe_serial.o
+obj-$(CONFIG_USB_SERIAL_SAMBA)                  += sam-ba.o
 obj-$(CONFIG_USB_SERIAL_SIEMENS_MPI)            += siemens_mpi.o
 obj-$(CONFIG_USB_SERIAL_SIERRAWIRELESS)         += sierra.o
 obj-$(CONFIG_USB_SERIAL_SPCP8X5)                += spcp8x5.o
@@ -58,6 +59,5 @@ obj-$(CONFIG_USB_SERIAL_TI)			+= ti_usb_3410_5052.o
 obj-$(CONFIG_USB_SERIAL_VISOR)                  += visor.o
 obj-$(CONFIG_USB_SERIAL_WHITEHEAT)              += whiteheat.o
 obj-$(CONFIG_USB_SERIAL_XIRCOM)                 += keyspan_pda.o
-obj-$(CONFIG_USB_SERIAL_VIVOPAY_SERIAL) += vivopay-serial.o
+obj-$(CONFIG_USB_SERIAL_VIVOPAY_SERIAL)         += vivopay-serial.o
 obj-$(CONFIG_USB_SERIAL_ZIO)                    += zio.o
-
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index 4f1744c5871f..8d7731dbf478 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -54,6 +54,7 @@ static int cp210x_carrier_raised(struct usb_serial_port *p);
 static int debug;
 
 static const struct usb_device_id id_table[] = {
+        { USB_DEVICE(0x045B, 0x0053) }, /* Renesas RX610 RX-Stick */
         { USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */
         { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */
         { USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */
@@ -132,6 +133,7 @@ static const struct usb_device_id id_table[] = {
         { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */
         { USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */
         { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */
+        { USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */
         { USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */
         { } /* Terminating Entry */
 };
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 891c20e3bb38..37b57c785cc7 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -177,6 +177,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_SNIFFER_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_THROTTLE_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GATEWAY_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GBM_PID) },
         { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) },
         { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) },
@@ -674,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) },
@@ -715,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) },
@@ -751,6 +780,7 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH4_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(FTDI_VID, SEGWAY_RMP200_PID) },
+        { USB_DEVICE(FTDI_VID, ACCESIO_COM4SM_PID) },
         { USB_DEVICE(IONICS_VID, IONICS_PLUGCOMPUTER_PID),
                 .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
         { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_24_MASTER_WING_PID) },
@@ -761,6 +791,9 @@ static struct usb_device_id id_table_combined [] = {
         { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MAXI_WING_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_MEDIA_WING_PID) },
         { USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_WING_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) },
         { },                                    /* Optional parameter entry */
         { }                                     /* Terminating entry */
 };
@@ -1559,6 +1592,7 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)
         ftdi_set_max_packet_size(port);
         if (read_latency_timer(port) < 0)
                 priv->latency = 16;
+        write_latency_timer(port);
         create_sysfs_attrs(port);
         return 0;
 }
@@ -1687,8 +1721,6 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port)
 
         dbg("%s", __func__);
 
-        write_latency_timer(port);
-
         /* No error checking for this (will get errors later anyway) */
         /* See ftdi_sio.h for description of what is reset */
         usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
@@ -2028,8 +2060,6 @@ static void ftdi_set_termios(struct tty_struct *tty,
                                 "urb failed to set to rts/cts flow control\n");
                 }
 
-                /* raise DTR/RTS */
-                set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
         } else {
                 /*
                  * Xon/Xoff code
@@ -2077,8 +2107,6 @@ static void ftdi_set_termios(struct tty_struct *tty,
                         }
                 }
 
-                /* lower DTR/RTS */
-                clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
         }
         return;
 }
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 15a4583775ad..cf1aea1b9ee7 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -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)
@@ -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
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 7aa01b95b1d4..2849f8c32015 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -549,9 +549,12 @@ static void mct_u232_close(struct usb_serial_port *port)
 {
         dbg("%s port %d", __func__, port->number);
 
-        usb_serial_generic_close(port);
-        if (port->serial->dev)
+        if (port->serial->dev) {
+                /* shutdown our urbs */
+                usb_kill_urb(port->write_urb);
+                usb_kill_urb(port->read_urb);
                 usb_kill_urb(port->interrupt_in_urb);
+        }
 } /* mct_u232_close */
 
 
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index ed01f3b2de8c..eda1f9266c4e 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -96,8 +96,8 @@ static void opticon_bulk_callback(struct urb *urb)
                         /* real data, send it to the tty layer */
                         tty = tty_port_tty_get(&port->port);
                         if (tty) {
-                                tty_insert_flip_string(tty, data,
-                                                               data_length);
+                                tty_insert_flip_string(tty, data + 2,
+                                                       data_length);
                                 tty_flip_buffer_push(tty);
                                 tty_kref_put(tty);
                         }
@@ -108,10 +108,10 @@ static void opticon_bulk_callback(struct urb *urb)
                                 else
                                         priv->rts = true;
                         } else {
-                        dev_dbg(&priv->udev->dev,
-                                "Unknown data packet received from the device:"
-                                " %2x %2x\n",
-                                data[0], data[1]);
+                                dev_dbg(&priv->udev->dev,
+                                        "Unknown data packet received from the device:"
+                                        " %2x %2x\n",
+                                        data[0], data[1]);
                         }
                 }
         } else {
@@ -130,7 +130,7 @@ exit:
                                                   priv->bulk_address),
                                   priv->bulk_in_buffer, priv->buffer_size,
                                   opticon_bulk_callback, priv);
-                result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
+                result = usb_submit_urb(priv->bulk_read_urb, GFP_ATOMIC);
                 if (result)
                         dev_err(&port->dev,
                             "%s - failed resubmitting read urb, error %d\n",
@@ -187,6 +187,9 @@ static void opticon_write_bulk_callback(struct urb *urb)
         /* free up the transfer buffer, as usb_free_urb() does not do this */
         kfree(urb->transfer_buffer);
 
+        /* setup packet may be set if we're using it for writing */
+        kfree(urb->setup_packet);
+
         if (status)
                 dbg("%s - nonzero write bulk status received: %d",
                     __func__, status);
@@ -237,10 +240,29 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port,
 
         usb_serial_debug_data(debug, &port->dev, __func__, count, buffer);
 
-        usb_fill_bulk_urb(urb, serial->dev,
-                          usb_sndbulkpipe(serial->dev,
-                                          port->bulk_out_endpointAddress),
-                          buffer, count, opticon_write_bulk_callback, priv);
+        if (port->bulk_out_endpointAddress) {
+                usb_fill_bulk_urb(urb, serial->dev,
+                                  usb_sndbulkpipe(serial->dev,
+                                                  port->bulk_out_endpointAddress),
+                                  buffer, count, opticon_write_bulk_callback, priv);
+        } else {
+                struct usb_ctrlrequest *dr;
+
+                dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_NOIO);
+                if (!dr)
+                        return -ENOMEM;
+
+                dr->bRequestType = USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT;
+                dr->bRequest = 0x01;
+                dr->wValue = 0;
+                dr->wIndex = 0;
+                dr->wLength = cpu_to_le16(count);
+
+                usb_fill_control_urb(urb, serial->dev,
+                        usb_sndctrlpipe(serial->dev, 0),
+                        (unsigned char *)dr, buffer, count,
+                        opticon_write_bulk_callback, priv);
+        }
 
         /* send it down the pipe */
         status = usb_submit_urb(urb, GFP_ATOMIC);
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index c46911af282f..2297fb1bcf65 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -392,6 +392,12 @@ static void option_instat_callback(struct urb *urb);
 #define CELOT_VENDOR_ID                         0x211f
 #define CELOT_PRODUCT_CT680M                    0x6801
 
+/* ONDA Communication vendor id */
+#define ONDA_VENDOR_ID       0x1ee8
+
+/* ONDA MT825UP HSDPA 14.2 modem */
+#define ONDA_MT825UP         0x000b
+
 /* some devices interfaces need special handling due to a number of reasons */
 enum option_blacklist_reason {
                 OPTION_BLACKLIST_NONE = 0,
@@ -622,6 +628,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0011, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0012, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0013, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0014, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0016, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff) },
@@ -633,38 +640,52 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0023, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0024, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0025, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0026, 0xff, 0xff, 0xff) },
+        /* { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0026, 0xff, 0xff, 0xff) }, */
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0028, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0029, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0030, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0034, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0038, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0039, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0040, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0042, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0043, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0044, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0048, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0049, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0050, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0051, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0052, 0xff, 0xff, 0xff) },
+        /* { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0053, 0xff, 0xff, 0xff) }, */
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0054, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0055, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0056, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0057, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0058, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0059, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0061, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0062, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0063, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0064, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0065, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0066, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0067, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0069, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0070, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0076, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0077, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0078, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0079, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0082, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0083, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0086, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2003, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0087, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0104, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0105, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0106, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0108, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0113, 0xff, 0xff, 0xff) },
@@ -880,6 +901,8 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0073, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0130, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0141, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff, 0xff, 0xff) },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2003, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
@@ -925,6 +948,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(CINTERION_VENDOR_ID, 0x0047) },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
         { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
+        { USB_DEVICE(ONDA_VENDOR_ID, ONDA_MT825UP) }, /* ONDA MT825UP modem */
         { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
index cde67cacb2c3..8858201eb1d3 100644
--- a/drivers/usb/serial/qcserial.c
+++ b/drivers/usb/serial/qcserial.c
@@ -118,6 +118,8 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
 
         spin_lock_init(&data->susp_lock);
 
+        usb_enable_autosuspend(serial->dev);
+
         switch (nintf) {
         case 1:
                 /* QDL mode */
@@ -150,7 +152,22 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
         case 3:
         case 4:
                 /* Composite mode */
-                if (ifnum == 2) {
+                /* ifnum == 0 is a broadband network adapter */
+                if (ifnum == 1) {
+                        /*
+                         * Diagnostics Monitor (serial line 9600 8N1)
+                         * Qualcomm DM protocol
+                         * use "libqcdm" (ModemManager) for communication
+                         */
+                        dbg("Diagnostics Monitor found");
+                        retval = usb_set_interface(serial->dev, ifnum, 0);
+                        if (retval < 0) {
+                                dev_err(&serial->dev->dev,
+                                        "Could not set interface, error %d\n",
+                                        retval);
+                                retval = -ENODEV;
+                        }
+                } else if (ifnum == 2) {
                         dbg("Modem port found");
                         retval = usb_set_interface(serial->dev, ifnum, 0);
                         if (retval < 0) {
@@ -161,6 +178,20 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
                                 kfree(data);
                         }
                         return retval;
+                } else if (ifnum==3) {
+                        /*
+                         * NMEA (serial line 9600 8N1)
+                         * # echo "\$GPS_START" > /dev/ttyUSBx
+                         * # echo "\$GPS_STOP"  > /dev/ttyUSBx
+                         */
+                        dbg("NMEA GPS interface found");
+                        retval = usb_set_interface(serial->dev, ifnum, 0);
+                        if (retval < 0) {
+                                dev_err(&serial->dev->dev,
+                                        "Could not set interface, error %d\n",
+                                        retval);
+                                retval = -ENODEV;
+                        }
                 }
                 break;
 
diff --git a/drivers/usb/serial/sam-ba.c b/drivers/usb/serial/sam-ba.c
new file mode 100644
index 000000000000..e3bba64afc57
--- /dev/null
+++ b/drivers/usb/serial/sam-ba.c
@@ -0,0 +1,206 @@
+/*
+ * Atmel SAM Boot Assistant (SAM-BA) driver
+ *
+ * Copyright (C) 2010 Johan Hovold <jhovold@gmail.com>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License version
+ *      2 as published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/tty.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/usb.h>
+#include <linux/usb/serial.h>
+
+
+#define DRIVER_VERSION  "v1.0"
+#define DRIVER_AUTHOR   "Johan Hovold <jhovold@gmail.com>"
+#define DRIVER_DESC     "Atmel SAM Boot Assistant (SAM-BA) driver"
+
+#define SAMBA_VENDOR_ID         0x3eb
+#define SAMBA_PRODUCT_ID        0x6124
+
+
+static int debug;
+
+static const struct usb_device_id id_table[] = {
+        /*
+         * NOTE: Only match the CDC Data interface.
+         */
+        { USB_DEVICE_AND_INTERFACE_INFO(SAMBA_VENDOR_ID, SAMBA_PRODUCT_ID,
+                                        USB_CLASS_CDC_DATA, 0, 0) },
+        { }
+};
+MODULE_DEVICE_TABLE(usb, id_table);
+
+static struct usb_driver samba_driver = {
+        .name           = "sam-ba",
+        .probe          = usb_serial_probe,
+        .disconnect     = usb_serial_disconnect,
+        .id_table       = id_table,
+        .no_dynamic_id  = 1,
+};
+
+
+/*
+ * NOTE: The SAM-BA firmware cannot handle merged write requests so we cannot
+ *       use the generic write implementation (which uses the port write fifo).
+ */
+static int samba_write(struct tty_struct *tty, struct usb_serial_port *port,
+                                        const unsigned char *buf, int count)
+{
+        struct urb *urb;
+        unsigned long flags;
+        int result;
+        int i;
+
+        if (!count)
+                return 0;
+
+        count = min_t(int, count, port->bulk_out_size);
+
+        spin_lock_irqsave(&port->lock, flags);
+        if (!port->write_urbs_free) {
+                spin_unlock_irqrestore(&port->lock, flags);
+                return 0;
+        }
+        i = find_first_bit(&port->write_urbs_free,
+                                                ARRAY_SIZE(port->write_urbs));
+        __clear_bit(i, &port->write_urbs_free);
+        port->tx_bytes += count;
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        urb = port->write_urbs[i];
+        memcpy(urb->transfer_buffer, buf, count);
+        urb->transfer_buffer_length = count;
+        usb_serial_debug_data(debug, &port->dev, __func__, count,
+                                                urb->transfer_buffer);
+        result = usb_submit_urb(urb, GFP_ATOMIC);
+        if (result) {
+                dev_err(&port->dev, "%s - error submitting urb: %d\n",
+                                                __func__, result);
+                spin_lock_irqsave(&port->lock, flags);
+                __set_bit(i, &port->write_urbs_free);
+                port->tx_bytes -= count;
+                spin_unlock_irqrestore(&port->lock, flags);
+
+                return result;
+        }
+
+        return count;
+}
+
+static int samba_write_room(struct tty_struct *tty)
+{
+        struct usb_serial_port *port = tty->driver_data;
+        unsigned long flags;
+        unsigned long free;
+        int count;
+        int room;
+
+        spin_lock_irqsave(&port->lock, flags);
+        free = port->write_urbs_free;
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        count = hweight_long(free);
+        room = count * port->bulk_out_size;
+
+        dbg("%s - returns %d", __func__, room);
+
+        return room;
+}
+
+static int samba_chars_in_buffer(struct tty_struct *tty)
+{
+        struct usb_serial_port *port = tty->driver_data;
+        unsigned long flags;
+        int chars;
+
+        spin_lock_irqsave(&port->lock, flags);
+        chars = port->tx_bytes;
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        dbg("%s - returns %d", __func__, chars);
+
+        return chars;
+}
+
+static void samba_write_bulk_callback(struct urb *urb)
+{
+        struct usb_serial_port *port = urb->context;
+        unsigned long flags;
+        int i;
+
+        dbg("%s - port %d", __func__, port->number);
+
+        for (i = 0; i < ARRAY_SIZE(port->write_urbs); ++i) {
+                if (port->write_urbs[i] == urb)
+                        break;
+        }
+        spin_lock_irqsave(&port->lock, flags);
+        __set_bit(i, &port->write_urbs_free);
+        port->tx_bytes -= urb->transfer_buffer_length;
+        spin_unlock_irqrestore(&port->lock, flags);
+
+        if (urb->status)
+                dbg("%s - non-zero urb status: %d", __func__, urb->status);
+
+        usb_serial_port_softint(port);
+}
+
+static struct usb_serial_driver samba_device = {
+        .driver = {
+                .owner          = THIS_MODULE,
+                .name           = "sam-ba",
+        },
+        .usb_driver             = &samba_driver,
+        .id_table               = id_table,
+        .num_ports              = 1,
+        .bulk_in_size           = 512,
+        .bulk_out_size          = 2048,
+        .write                  = samba_write,
+        .write_room             = samba_write_room,
+        .chars_in_buffer        = samba_chars_in_buffer,
+        .write_bulk_callback    = samba_write_bulk_callback,
+        .throttle               = usb_serial_generic_throttle,
+        .unthrottle             = usb_serial_generic_unthrottle,
+};
+
+static int __init samba_init(void)
+{
+        int retval;
+
+        retval = usb_serial_register(&samba_device);
+        if (retval)
+                return retval;
+
+        retval = usb_register(&samba_driver);
+        if (retval) {
+                usb_serial_deregister(&samba_device);
+                return retval;
+        }
+
+        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ": "
+                                                        DRIVER_DESC "\n");
+        return 0;
+}
+
+static void __exit samba_exit(void)
+{
+        usb_deregister(&samba_driver);
+        usb_serial_deregister(&samba_device);
+}
+
+module_init(samba_init);
+module_exit(samba_exit);
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_LICENSE("GPL");
+
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Enable verbose debugging messages");
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index eb76aaef4268..15a5d89b7f39 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -606,6 +606,10 @@ static int treo_attach(struct usb_serial *serial)
 
 static int clie_5_attach(struct usb_serial *serial)
 {
+        struct usb_serial_port *port;
+        unsigned int pipe;
+        int j;
+
         dbg("%s", __func__);
 
         /* TH55 registers 2 ports.
@@ -621,9 +625,14 @@ static int clie_5_attach(struct usb_serial *serial)
                 return -1;
 
         /* port 0 now uses the modified endpoint Address */
-        serial->port[0]->bulk_out_endpointAddress =
+        port = serial->port[0];
+        port->bulk_out_endpointAddress =
                                 serial->port[1]->bulk_out_endpointAddress;
 
+        pipe = usb_sndbulkpipe(serial->dev, port->bulk_out_endpointAddress);
+        for (j = 0; j < ARRAY_SIZE(port->write_urbs); ++j)
+                port->write_urbs[j]->pipe = pipe;
+
         return 0;
 }