Add Silicon Lab CP210X Support

Eric Lee
1 parent 8b3d0a5232
Showing 2 changed files with 323 additions and 115 deletions Side-by-side Diff
arch/arm/configs/smarc_t335x_defconfig
drivers/usb/serial/cp210x.c
@@ -2027,7 +2027,8 @@
 #
 # USB port drivers
 #
-CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL=y
+# CONFIG_USB_SERIAL_CONSOLE is not set
 # CONFIG_USB_EZUSB is not set
 # CONFIG_USB_SERIAL_GENERIC is not set
 # CONFIG_USB_SERIAL_AIRCABLE is not set
@@ -2036,7 +2037,7 @@
 # CONFIG_USB_SERIAL_CH341 is not set
 # CONFIG_USB_SERIAL_WHITEHEAT is not set
 # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
-CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CP210X=y
 # CONFIG_USB_SERIAL_CYPRESS_M8 is not set
 # CONFIG_USB_SERIAL_EMPEG is not set
 # CONFIG_USB_SERIAL_FTDI_SIO is not set
@@ -35,10 +35,14 @@
  */
 static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *);
 static void cp210x_close(struct usb_serial_port *);
+static int cp210x_ioctl(struct tty_struct *tty,
+        unsigned int cmd, unsigned long arg);
 static void cp210x_get_termios(struct tty_struct *,
 	struct usb_serial_port *port);
 static void cp210x_get_termios_port(struct usb_serial_port *port,
 	unsigned int *cflagp, unsigned int *baudp);
+static void cp210x_change_speed(struct tty_struct *, struct usb_serial_port *,
+                                                        struct ktermios *);
 static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *,
 							struct ktermios*);
 static int cp210x_tiocmget(struct tty_struct *);
@@ -47,6 +51,7 @@
 		unsigned int, unsigned int);
 static void cp210x_break_ctl(struct tty_struct *, int);
 static int cp210x_startup(struct usb_serial *);
+static void cp210x_release(struct usb_serial *);
 static void cp210x_dtr_rts(struct usb_serial_port *p, int on);
  
 static int debug;
@@ -92,6 +97,7 @@
 	{ USB_DEVICE(0x10C4, 0x818B) }, /* AVIT Research USB to TTL */
 	{ USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */
 	{ USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */
+        { USB_DEVICE(0x10C4, 0x81A9) }, /* Multiplex RC Interface */
 	{ USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */
 	{ USB_DEVICE(0x10C4, 0x81AD) }, /* INSYS USB Modem */
 	{ USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */
@@ -118,6 +124,8 @@
 	{ USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */
 	{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
 	{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
+        { USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
+        { USB_DEVICE(0x10C4, 0xEA80) }, /* Silicon Labs factory default */
 	{ USB_DEVICE(0x10C4, 0xEA71) }, /* Infinity GPS-MIC-1 Radio Monophone */
 	{ USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
 	{ USB_DEVICE(0x10C4, 0xF002) }, /* Elan Digital Systems USBwave12 */
  
  
@@ -133,16 +141,24 @@
 	{ USB_DEVICE(0x16DC, 0x0011) }, /* W-IE-NE-R Plein & Baus GmbH RCM Remote Control for MARATON Power Supply */
 	{ USB_DEVICE(0x16DC, 0x0012) }, /* W-IE-NE-R Plein & Baus GmbH MPOD Multi Channel Power Supply */
 	{ USB_DEVICE(0x16DC, 0x0015) }, /* W-IE-NE-R Plein & Baus GmbH CML Control, Monitoring and Data Logger */
+        { USB_DEVICE(0x17A8, 0x0001) }, /* Kamstrup Optical Eye/3-wire */
+        { USB_DEVICE(0x17A8, 0x0005) }, /* Kamstrup M-Bus Master MultiPort 250D */
 	{ 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(0x3195, 0xF190) }, /* Link Instruments MSO-19 */
 	{ USB_DEVICE(0x413C, 0x9500) }, /* DW700 GPS USB interface */
 	{ } /* Terminating Entry */
 };
  
 MODULE_DEVICE_TABLE(usb, id_table);
  
+struct cp210x_port_private {
+        __u8                    bInterfaceNumber;
+        __u8                    bPartNumber;
+};
+
 static struct usb_driver cp210x_driver = {
 	.name		= "cp210x",
 	.probe		= usb_serial_probe,
  
  
  
@@ -163,17 +179,33 @@
 	.bulk_out_size		= 256,
 	.open			= cp210x_open,
 	.close			= cp210x_close,
+        .ioctl                  = cp210x_ioctl,
 	.break_ctl		= cp210x_break_ctl,
 	.set_termios		= cp210x_set_termios,
 	.tiocmget 		= cp210x_tiocmget,
 	.tiocmset		= cp210x_tiocmset,
 	.attach			= cp210x_startup,
+        .release                = cp210x_release,
 	.dtr_rts		= cp210x_dtr_rts
 };
  
+/* Part number definitions */
+#define CP2101_PARTNUM          0x01
+#define CP2102_PARTNUM          0x02
+#define CP2103_PARTNUM          0x03
+#define CP2104_PARTNUM          0x04
+#define CP2105_PARTNUM          0x05
+#define CP2108_PARTNUM          0x08
+
+/* IOCTLs */
+#define IOCTL_GPIOGET           0x8000
+#define IOCTL_GPIOSET           0x8001
+
 /* Config request types */
-#define REQTYPE_HOST_TO_DEVICE	0x41
-#define REQTYPE_DEVICE_TO_HOST	0xc1
+#define REQTYPE_HOST_TO_INTERFACE 	0x41
+#define REQTYPE_INTERFACE_TO_HOST 	0xc1
+#define REQTYPE_HOST_TO_DEVICE  0x40
+#define REQTYPE_DEVICE_TO_HOST  0xc0
  
 /* Config request codes */
 #define CP210X_IFC_ENABLE	0x00
  
@@ -200,11 +232,19 @@
 #define CP210X_EMBED_EVENTS	0x15
 #define CP210X_GET_EVENTSTATE	0x16
 #define CP210X_SET_CHARS	0x19
+#define CP210X_GET_BAUDRATE     0x1D
+#define CP210X_SET_BAUDRATE     0x1E
+#define CP210X_VENDOR_SPECIFIC  0xFF
  
 /* CP210X_IFC_ENABLE */
 #define UART_ENABLE		0x0001
 #define UART_DISABLE		0x0000
  
+/* CP210X_VENDOR_SPECIFIC */
+#define CP210X_WRITE_LATCH      0x37E1
+#define CP210X_READ_LATCH       0x00C2
+#define CP210X_GET_PARTNUM      0x370B
+
 /* CP210X_(SET|GET)_BAUDDIV */
 #define BAUD_RATE_GEN_FREQ	0x384000
  
  
@@ -249,10 +289,11 @@
  * 'data' is a pointer to a pre-allocated array of integers large
  * enough to hold 'size' bytes (with 4 bytes to each integer)
  */
-static int cp210x_get_config(struct usb_serial_port *port, u8 request,
-		unsigned int *data, int size)
+static int cp210x_get_config(struct usb_serial_port *port, u8 requestType,
+                u8 request, int value, unsigned int *data, int size)
 {
 	struct usb_serial *serial = port->serial;
+        struct cp210x_port_private *port_priv = usb_get_serial_port_data(port);
 	__le32 *buf;
 	int result, i, length;
  
@@ -266,9 +307,9 @@
 	}
  
 	/* Issue the request, attempting to read 'size' bytes */
-	result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
-				request, REQTYPE_DEVICE_TO_HOST, 0x0000,
-				0, buf, size, 300);
+        result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
+                                request, requestType, value,
+                                port_priv->bInterfaceNumber, buf, size, 300);
  
 	/* Convert data into an array of integers */
 	for (i = 0; i < length; i++)
  
@@ -280,7 +321,10 @@
 		dbg("%s - Unable to send config request, "
 				"request=0x%x size=%d result=%d\n",
 				__func__, request, size, result);
+                if (result > 0)
 		return -EPROTO;
+
+                return result;
 	}
  
 	return 0;
  
  
@@ -292,13 +336,17 @@
  * Values less than 16 bits wide are sent directly
  * 'size' is specified in bytes.
  */
-static int cp210x_set_config(struct usb_serial_port *port, u8 request,
-		unsigned int *data, int size)
+static int cp210x_set_config(struct usb_serial_port *port, u8 requestType,
+                u8 request, int value, unsigned int *data, int size)
 {
 	struct usb_serial *serial = port->serial;
-	__le32 *buf;
-	int result, i, length;
+        struct cp210x_port_private *port_priv = usb_get_serial_port_data(port);
+        __le32 *buf = NULL;
+        int result, i, length = 0;
  
+        if (size)
+        {
+
 	/* Number of integers required to contain the array */
 	length = (((size - 1) | 3) + 1)/4;
  
  
  
  
  
  
@@ -312,40 +360,28 @@
 	/* Array of integers into bytes */
 	for (i = 0; i < length; i++)
 		buf[i] = cpu_to_le32(data[i]);
+        }
  
-	if (size > 2) {
-		result = usb_control_msg(serial->dev,
-				usb_sndctrlpipe(serial->dev, 0),
-				request, REQTYPE_HOST_TO_DEVICE, 0x0000,
-				0, buf, size, 300);
-	} else {
-		result = usb_control_msg(serial->dev,
-				usb_sndctrlpipe(serial->dev, 0),
-				request, REQTYPE_HOST_TO_DEVICE, data[0],
-				0, NULL, 0, 300);
-	}
+        result = usb_control_msg(serial->dev,
+                        usb_sndctrlpipe(serial->dev, 0),
+                        request, requestType, value,
+                        port_priv->bInterfaceNumber, buf, size, 300);
  
-	kfree(buf);
  
-	if ((size > 2 && result != size) || result < 0) {
-		dbg("%s - Unable to send request, "
-				"request=0x%x size=%d result=%d\n",
-				__func__, request, size, result);
-		return -EPROTO;
-	}
+        if (buf)
+                kfree(buf);
  
-	return 0;
-}
+        if (result != size) {
+                dbg("%s - Unable to send request, "
+                                "request=0x%x size=%d result=%d\n",
+                                __func__, request, size, result);
+                if (result > 0)
+                        result = -EPROTO;
  
-/*
- * cp210x_set_config_single
- * Convenience function for calling cp210x_set_config on single data values
- * without requiring an integer pointer
- */
-static inline int cp210x_set_config_single(struct usb_serial_port *port,
-		u8 request, unsigned int data)
-{
-	return cp210x_set_config(port, request, &data, 2);
+                return result;
+        }
+
+        return 0;
 }
  
 /*
@@ -353,8 +389,8 @@
  * Quantises the baud rate as per AN205 Table 1
  */
 static unsigned int cp210x_quantise_baudrate(unsigned int baud) {
-	if      (baud <= 56)       baud = 0;
-	else if (baud <= 300)      baud = 300;
+        if (baud <= 300)
+                baud = 300;
 	else if (baud <= 600)      baud = 600;
 	else if (baud <= 1200)     baud = 1200;
 	else if (baud <= 1800)     baud = 1800;
@@ -382,11 +418,11 @@
 	else if (baud <= 491520)   baud = 460800;
 	else if (baud <= 567138)   baud = 500000;
 	else if (baud <= 670254)   baud = 576000;
-	else if (baud <= 1053257)  baud = 921600;
-	else if (baud <= 1474560)  baud = 1228800;
-	else if (baud <= 2457600)  baud = 1843200;
-	else                       baud = 3686400;
-	return baud;
+        else if (baud < 1000000)
+                baud = 921600;
+        else if (baud > 2000000)
+                baud = 2000000;
+        return baud;
 }
  
 static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port)
  
  
@@ -395,19 +431,21 @@
  
 	dbg("%s - port %d", __func__, port->number);
  
-	if (cp210x_set_config_single(port, CP210X_IFC_ENABLE, UART_ENABLE)) {
-		dev_err(&port->dev, "%s - Unable to enable UART\n",
-				__func__);
-		return -EPROTO;
-	}
+        result = cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_IFC_ENABLE, UART_ENABLE, NULL, 0);
+        if (result) {
+                dev_err(&port->dev, "%s - Unable to enable UART\n", __func__);
+                return result;
+        }
  
-	result = usb_serial_generic_open(tty, port);
-	if (result)
-		return result;
-
 	/* Configure the termios structure */
 	cp210x_get_termios(tty, port);
-	return 0;
+
+        /* The baud rate must be initialised on cp2104 */
+        if (tty)
+                cp210x_change_speed(tty, port, NULL);
+
+        return usb_serial_generic_open(tty, port);
 }
  
 static void cp210x_close(struct usb_serial_port *port)
  
@@ -418,10 +456,82 @@
  
 	mutex_lock(&port->serial->disc_mutex);
 	if (!port->serial->disconnected)
-		cp210x_set_config_single(port, CP210X_IFC_ENABLE, UART_DISABLE);
+                cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_IFC_ENABLE, UART_DISABLE, NULL, 0);
 	mutex_unlock(&port->serial->disc_mutex);
 }
  
+static int cp210x_ioctl(struct tty_struct *tty,
+        unsigned int cmd, unsigned long arg)
+{
+        struct usb_serial_port *port = tty->driver_data;
+        struct cp210x_port_private *port_priv = usb_get_serial_port_data(port);
+
+        switch (cmd) {
+
+        case IOCTL_GPIOGET:
+                if ((port_priv->bPartNumber == CP2103_PARTNUM) ||
+                        (port_priv->bPartNumber == CP2104_PARTNUM)) {
+                        cp210x_get_config(port, REQTYPE_DEVICE_TO_HOST,
+                                        CP210X_VENDOR_SPECIFIC,
+                                        CP210X_READ_LATCH,
+                                        (unsigned int*)arg, 1);
+                }
+                else if (port_priv->bPartNumber == CP2105_PARTNUM) {
+                        cp210x_get_config(port, REQTYPE_INTERFACE_TO_HOST,
+                                        CP210X_VENDOR_SPECIFIC,
+                                        CP210X_READ_LATCH,
+                                        (unsigned int*)arg, 1);
+                }
+                else if (port_priv->bPartNumber == CP2108_PARTNUM) {
+                        cp210x_get_config(port, REQTYPE_DEVICE_TO_HOST,
+                                        CP210X_VENDOR_SPECIFIC,
+                                        CP210X_READ_LATCH,
+                                        (unsigned int*)arg, 2);
+                }
+                else {
+                        return -ENOTSUPP;
+                }
+                break;
+
+        case IOCTL_GPIOSET:
+                if ((port_priv->bPartNumber == CP2103_PARTNUM) ||
+                        (port_priv->bPartNumber == CP2104_PARTNUM)) {
+                        /*cp210x_set_config(port, REQTYPE_HOST_TO_DEVICE,
+                                        CP210x_VENDOR_SPECIFIC,
+                                        CP210x_GPIO_WRITE_LATCH, &val, 2);*/
+                        usb_control_msg(port->serial->dev,
+                                        usb_sndctrlpipe(port->serial->dev, 0),
+                                        CP210X_VENDOR_SPECIFIC,
+                                        REQTYPE_HOST_TO_DEVICE,
+                                        CP210X_WRITE_LATCH,
+                                        *(unsigned long*)arg,
+                                        NULL, 0, 300);
+                }
+                else if (port_priv->bPartNumber == CP2105_PARTNUM) {
+                        cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                        CP210X_VENDOR_SPECIFIC,
+                                        CP210X_WRITE_LATCH,
+                                        (unsigned int*)arg, 2);
+                }
+                else if (port_priv->bPartNumber == CP2108_PARTNUM) {
+                        cp210x_set_config(port, REQTYPE_HOST_TO_DEVICE,
+                                        CP210X_VENDOR_SPECIFIC,
+                                        CP210X_WRITE_LATCH,
+                                        (unsigned int*)arg, 4);
+                }
+                else {
+                        return -ENOTSUPP;
+                }
+                break;
+
+        default:
+                break;
+        }
+
+        return -ENOIOCTLCMD;
+}
+
 /*
  * cp210x_get_termios
  * Reads the baud rate, data bits, parity, stop bits and flow control mode
  
  
  
@@ -459,17 +569,16 @@
  
 	dbg("%s - port %d", __func__, port->number);
  
-	cp210x_get_config(port, CP210X_GET_BAUDDIV, &baud, 2);
-	/* Convert to baudrate */
-	if (baud)
-		baud = cp210x_quantise_baudrate((BAUD_RATE_GEN_FREQ + baud/2)/ baud);
+        cp210x_get_config(port, REQTYPE_INTERFACE_TO_HOST,
+                        CP210X_GET_BAUDRATE, 0, &baud, 4);
  
-	dbg("%s - baud rate = %d", __func__, baud);
-	*baudp = baud;
+        dbg("%s - baud rate = %d", __func__, baud);
+        *baudp = baud;
  
-	cflag = *cflagp;
+        cflag = *cflagp;
  
-	cp210x_get_config(port, CP210X_GET_LINE_CTL, &bits, 2);
+        cp210x_get_config(port, REQTYPE_INTERFACE_TO_HOST,
+                        CP210X_GET_LINE_CTL, 0, &bits, 2);
 	cflag &= ~CSIZE;
 	switch (bits & BITS_DATA_MASK) {
 	case BITS_DATA_5:
  
@@ -494,14 +603,16 @@
 		cflag |= CS8;
 		bits &= ~BITS_DATA_MASK;
 		bits |= BITS_DATA_8;
-		cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2);
+                cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_SET_LINE_CTL, 0, &bits, 2);
 		break;
 	default:
 		dbg("%s - Unknown number of data bits, using 8", __func__);
 		cflag |= CS8;
 		bits &= ~BITS_DATA_MASK;
 		bits |= BITS_DATA_8;
-		cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2);
+                cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_SET_LINE_CTL, 0, &bits, 2);
 		break;
 	}
  
  
  
@@ -520,24 +631,20 @@
 		cflag |= PARENB;
 		break;
 	case BITS_PARITY_MARK:
-		dbg("%s - parity = MARK (not supported, disabling parity)",
-				__func__);
-		cflag &= ~PARENB;
-		bits &= ~BITS_PARITY_MASK;
-		cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2);
-		break;
+                dbg("%s - parity = MARK", __func__);
+                cflag |= (PARENB|PARODD|CMSPAR);
+                break;
 	case BITS_PARITY_SPACE:
-		dbg("%s - parity = SPACE (not supported, disabling parity)",
-				__func__);
-		cflag &= ~PARENB;
-		bits &= ~BITS_PARITY_MASK;
-		cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2);
-		break;
+                dbg("%s - parity = SPACE", __func__);
+                cflag &= ~PARODD;
+                cflag |= (PARENB|CMSPAR);
+                break;
 	default:
 		dbg("%s - Unknown parity mode, disabling parity", __func__);
 		cflag &= ~PARENB;
 		bits &= ~BITS_PARITY_MASK;
-		cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2);
+                cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_SET_LINE_CTL, 0, &bits, 2);
 		break;
 	}
  
@@ -550,7 +657,8 @@
 		dbg("%s - stop bits = 1.5 (not supported, using 1 stop bit)",
 								__func__);
 		bits &= ~BITS_STOP_MASK;
-		cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2);
+                cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_SET_LINE_CTL, 0, &bits, 2);
 		break;
 	case BITS_STOP_2:
 		dbg("%s - stop bits = 2", __func__);
  
@@ -560,11 +668,13 @@
 		dbg("%s - Unknown number of stop bits, using 1 stop bit",
 								__func__);
 		bits &= ~BITS_STOP_MASK;
-		cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2);
+                cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_SET_LINE_CTL, 0, &bits, 2);
 		break;
 	}
  
-	cp210x_get_config(port, CP210X_GET_FLOW, modem_ctl, 16);
+        cp210x_get_config(port, REQTYPE_INTERFACE_TO_HOST,
+                        CP210X_GET_FLOW, 0, modem_ctl, 16);
 	if (modem_ctl[0] & 0x0008) {
 		dbg("%s - flow control = CRTSCTS", __func__);
 		cflag |= CRTSCTS;
  
@@ -576,11 +686,64 @@
 	*cflagp = cflag;
 }
  
+/*
+ * CP2101 supports the following baud rates:
+ *
+ *      300, 600, 1200, 1800, 2400, 4800, 7200, 9600, 14400, 19200, 28800,
+ *      38400, 56000, 57600, 115200, 128000, 230400, 460800, 921600
+ *
+ * CP2102 and CP2103 support the following additional rates:
+ *
+ *      4000, 16000, 51200, 64000, 76800, 153600, 250000, 256000, 500000,
+ *      576000
+ *
+ * The device will map a requested rate to a supported one, but the result
+ * of requests for rates greater than 1053257 is undefined (see AN205).
+ *
+ * CP2104, CP2105 and CP2110 support most rates up to 2M, 921k and 1M baud,
+ * respectively, with an error less than 1%. The actual rates are determined
+ * by
+ *
+ *      div = round(freq / (2 x prescale x request))
+ *      actual = freq / (2 x prescale x div)
+ *
+ * For CP2104 and CP2105 freq is 48Mhz and prescale is 4 for request <= 365bps
+ * or 1 otherwise.
+ * For CP2110 freq is 24Mhz and prescale is 4 for request <= 300bps or 1
+ * otherwise.
+ */
+static void cp210x_change_speed(struct tty_struct *tty,
+                struct usb_serial_port *port, struct ktermios *old_termios)
+{
+        u32 baud;
+
+        baud = tty->termios->c_ospeed;
+
+        /* This maps the requested rate to a rate valid on cp2102 or cp2103,
+         * or to an arbitrary rate in [1M,2M].
+         *
+         * NOTE: B0 is not implemented.
+         */
+        baud = cp210x_quantise_baudrate(baud);
+
+        dbg("%s - setting baud rate to %u", __func__, baud);
+        if (cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                        CP210X_SET_BAUDRATE, 0, &baud, sizeof(baud))) {
+                dev_warn(&port->dev, "failed to set baud rate to %u\n", baud);
+                if (old_termios)
+                        baud = old_termios->c_ospeed;
+                else
+                        baud = 9600;
+        }
+
+        tty_encode_baud_rate(tty, baud, baud);
+}
+
 static void cp210x_set_termios(struct tty_struct *tty,
 		struct usb_serial_port *port, struct ktermios *old_termios)
 {
 	unsigned int cflag, old_cflag;
-	unsigned int baud = 0, bits;
+        unsigned int bits;
 	unsigned int modem_ctl[4];
  
 	dbg("%s - port %d", __func__, port->number);
  
  
  
@@ -588,27 +751,15 @@
 	if (!tty)
 		return;
  
-	tty->termios->c_cflag &= ~CMSPAR;
 	cflag = tty->termios->c_cflag;
 	old_cflag = old_termios->c_cflag;
-	baud = cp210x_quantise_baudrate(tty_get_baud_rate(tty));
  
-	/* If the baud rate is to be updated*/
-	if (baud != tty_termios_baud_rate(old_termios) && baud != 0) {
-		dbg("%s - Setting baud rate to %d baud", __func__,
-				baud);
-		if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV,
-					((BAUD_RATE_GEN_FREQ + baud/2) / baud))) {
-			dbg("Baud rate requested not supported by device");
-			baud = tty_termios_baud_rate(old_termios);
-		}
-	}
-	/* Report back the resulting baud rate */
-	tty_encode_baud_rate(tty, baud, baud);
+        cp210x_change_speed(tty, port, old_termios);
  
 	/* If the number of data bits is to be updated */
 	if ((cflag & CSIZE) != (old_cflag & CSIZE)) {
-		cp210x_get_config(port, CP210X_GET_LINE_CTL, &bits, 2);
+                cp210x_get_config(port, REQTYPE_INTERFACE_TO_HOST,
+                                CP210X_GET_LINE_CTL, 0, &bits, 2);
 		bits &= ~BITS_DATA_MASK;
 		switch (cflag & CSIZE) {
 		case CS5:
  
  
  
  
  
  
@@ -638,30 +789,45 @@
 				bits |= BITS_DATA_8;
 				break;
 		}
-		if (cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2))
+                if (cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_SET_LINE_CTL, 0, &bits, 2))
 			dbg("Number of data bits requested "
 					"not supported by device\n");
 	}
  
-	if ((cflag & (PARENB|PARODD)) != (old_cflag & (PARENB|PARODD))) {
-		cp210x_get_config(port, CP210X_GET_LINE_CTL, &bits, 2);
+        if ((cflag     & (PARENB|PARODD|CMSPAR)) !=
+            (old_cflag & (PARENB|PARODD|CMSPAR))) {
+                cp210x_get_config(port, REQTYPE_INTERFACE_TO_HOST,
+                                CP210X_GET_LINE_CTL, 0, &bits, 2);
 		bits &= ~BITS_PARITY_MASK;
 		if (cflag & PARENB) {
+                        if (cflag & CMSPAR) {
 			if (cflag & PARODD) {
+                                    bits |= BITS_PARITY_MARK;
+                                    dbg("%s - parity = MARK", __func__);
+                            } else {
+                                    bits |= BITS_PARITY_SPACE;
+                                    dbg("%s - parity = SPACE", __func__);
+                            }
+                        } else {
+                            if (cflag & PARODD) {
 				bits |= BITS_PARITY_ODD;
 				dbg("%s - parity = ODD", __func__);
 			} else {
 				bits |= BITS_PARITY_EVEN;
 				dbg("%s - parity = EVEN", __func__);
 			}
+                        }
 		}
-		if (cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2))
+                if (cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_SET_LINE_CTL, 0, &bits, 2))
 			dbg("Parity mode not supported "
 					"by device\n");
 	}
  
 	if ((cflag & CSTOPB) != (old_cflag & CSTOPB)) {
-		cp210x_get_config(port, CP210X_GET_LINE_CTL, &bits, 2);
+                cp210x_get_config(port, REQTYPE_INTERFACE_TO_HOST,
+                                CP210X_GET_LINE_CTL, 0, &bits, 2);
 		bits &= ~BITS_STOP_MASK;
 		if (cflag & CSTOPB) {
 			bits |= BITS_STOP_2;
  
@@ -670,13 +836,15 @@
 			bits |= BITS_STOP_1;
 			dbg("%s - stop bits = 1", __func__);
 		}
-		if (cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2))
+                if (cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_SET_LINE_CTL, 0, &bits, 2))
 			dbg("Number of stop bits requested "
 					"not supported by device\n");
 	}
  
 	if ((cflag & CRTSCTS) != (old_cflag & CRTSCTS)) {
-		cp210x_get_config(port, CP210X_GET_FLOW, modem_ctl, 16);
+                cp210x_get_config(port, REQTYPE_INTERFACE_TO_HOST,
+                                CP210X_GET_FLOW, 0, modem_ctl, 16);
 		dbg("%s - read modem controls = 0x%.4x 0x%.4x 0x%.4x 0x%.4x",
 				__func__, modem_ctl[0], modem_ctl[1],
 				modem_ctl[2], modem_ctl[3]);
@@ -696,7 +864,8 @@
 		dbg("%s - write modem controls = 0x%.4x 0x%.4x 0x%.4x 0x%.4x",
 				__func__, modem_ctl[0], modem_ctl[1],
 				modem_ctl[2], modem_ctl[3]);
-		cp210x_set_config(port, CP210X_SET_FLOW, modem_ctl, 16);
+                cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_SET_FLOW, 0, modem_ctl, 16);
 	}
  
 }
@@ -734,7 +903,8 @@
  
 	dbg("%s - control = 0x%.4x", __func__, control);
  
-	return cp210x_set_config(port, CP210X_SET_MHS, &control, 2);
+        return cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                                CP210X_SET_MHS, 0, &control, 2);
 }
  
 static void cp210x_dtr_rts(struct usb_serial_port *p, int on)
@@ -753,7 +923,8 @@
  
 	dbg("%s - port %d", __func__, port->number);
  
-	cp210x_get_config(port, CP210X_GET_MDMSTS, &control, 1);
+        cp210x_get_config(port, REQTYPE_INTERFACE_TO_HOST,
+                        CP210X_GET_MDMSTS, 0, &control, 1);
  
 	result = ((control & CONTROL_DTR) ? TIOCM_DTR : 0)
 		|((control & CONTROL_RTS) ? TIOCM_RTS : 0)
  
  
@@ -779,14 +950,50 @@
 		state = BREAK_ON;
 	dbg("%s - turning break %s", __func__,
 			state == BREAK_OFF ? "off" : "on");
-	cp210x_set_config(port, CP210X_SET_BREAK, &state, 2);
+        cp210x_set_config(port, REQTYPE_HOST_TO_INTERFACE,
+                        CP210X_SET_BREAK, 0, &state, 2);
 }
  
 static int cp210x_startup(struct usb_serial *serial)
 {
+        struct cp210x_port_private *port_priv;
+        int i;
+        unsigned int partNum;
+
 	/* cp210x buffers behave strangely unless device is reset */
 	usb_reset_device(serial->dev);
-	return 0;
+
+        for (i = 0; i < serial->num_ports; i++) {
+                port_priv = kzalloc(sizeof(*port_priv), GFP_KERNEL);
+                if (!port_priv)
+                        return -ENOMEM;
+
+                memset(port_priv, 0x00, sizeof(*port_priv));
+                port_priv->bInterfaceNumber =
+                        serial->interface->cur_altsetting->desc.bInterfaceNumber;
+
+                usb_set_serial_port_data(serial->port[i], port_priv);
+
+                /* Get the 1-byte part number of the cp210x device */
+                cp210x_get_config(serial->port[i],
+                        REQTYPE_DEVICE_TO_HOST, CP210X_VENDOR_SPECIFIC,
+                        CP210X_GET_PARTNUM, &partNum, 1);
+                port_priv->bPartNumber = partNum & 0xFF;
+        }
+
+        return 0;
+}
+
+static void cp210x_release(struct usb_serial *serial)
+{
+        struct cp210x_port_private *port_priv;
+        int i;
+
+        for (i = 0; i < serial->num_ports; i++) {
+                port_priv = usb_get_serial_port_data(serial->port[i]);
+                kfree(port_priv);
+                usb_set_serial_port_data(serial->port[i], NULL);
+        }
 }
  
 static int __init cp210x_init(void)
...	...	@@ -2027,7 +2027,8 @@
2027	2027	#
2028	2028	# USB port drivers
2029	2029	#
2030		-CONFIG_USB_SERIAL=m
	2030	+CONFIG_USB_SERIAL=y
	2031	+# CONFIG_USB_SERIAL_CONSOLE is not set
2031	2032	# CONFIG_USB_EZUSB is not set
2032	2033	# CONFIG_USB_SERIAL_GENERIC is not set
2033	2034	# CONFIG_USB_SERIAL_AIRCABLE is not set
...	...	@@ -2036,7 +2037,7 @@
2036	2037	# CONFIG_USB_SERIAL_CH341 is not set
2037	2038	# CONFIG_USB_SERIAL_WHITEHEAT is not set
2038	2039	# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
2039		-CONFIG_USB_SERIAL_CP210X=m
	2040	+CONFIG_USB_SERIAL_CP210X=y
2040	2041	# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
2041	2042	# CONFIG_USB_SERIAL_EMPEG is not set
2042	2043	# CONFIG_USB_SERIAL_FTDI_SIO is not set