diff options
| -rw-r--r-- | series | 5 | ||||
| -rw-r--r-- | staging-pata_rdc-coding-style-fixes.patch | 18 | ||||
| -rw-r--r-- | usb/usb-cp210x-add-device-ids.patch | 58 | ||||
| -rw-r--r-- | usb/usb-cp210x-replace-cp2101-with-cp210x.patch | 571 | ||||
| -rw-r--r-- | usb/usb-cp210x-use-official-request-code-definitions.patch | 312 | ||||
| -rw-r--r-- | version | 2 |
6 files changed, 19 insertions, 947 deletions
@@ -206,9 +206,6 @@ usb/usb-cdc-acm-quirk-for-alcatel-ot-i650.patch usb/usb-gadget-fix-rndis-code-to-pass-usb-compliance-tests-with-g_ether.patch usb/usb-pl2303-usb_serial-implement-sysrq-handling-on-break.patch usb/usb-usb_serial-only-allow-sysrq-on-a-console-port.patch -usb/usb-cp210x-add-device-ids.patch -usb/usb-cp210x-use-official-request-code-definitions.patch -usb/usb-cp210x-replace-cp2101-with-cp210x.patch usb/usb-gadget-add-i.mx3x-support-to-the-fsl_usb2_udc-driver.patch usb/usb-gadget-driver-for-samsung-hs-otg-block.patch @@ -601,6 +598,6 @@ staging/staging-remove-obsolete-serqt_usb-driver.patch staging-add-pata_rdc-driver.patch +staging-pata_rdc-add-driver-to-the-build-system.patch staging-pata_rdc-convert-code-to-work-in-2.6.29.patch staging-pata_rdc-coding-style-fixes.patch -staging-pata_rdc-add-driver-to-the-build-system.patch diff --git a/staging-pata_rdc-coding-style-fixes.patch b/staging-pata_rdc-coding-style-fixes.patch index b1d8b366277a00..465b5aecfcfb36 100644 --- a/staging-pata_rdc-coding-style-fixes.patch +++ b/staging-pata_rdc-coding-style-fixes.patch @@ -11,9 +11,25 @@ Cc: Tomy Wang <Tomy.Wang@rdc.com.tw> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- + drivers/staging/pata_rdc/pata_rdc.c | 6 drivers/staging/pata_rdc/pata_rdc.h | 355 ++++++++++++++---------------------- - 1 file changed, 147 insertions(+), 208 deletions(-) + 2 files changed, 150 insertions(+), 211 deletions(-) +--- a/drivers/staging/pata_rdc/pata_rdc.c ++++ b/drivers/staging/pata_rdc/pata_rdc.c +@@ -30,9 +30,9 @@ + + + static const struct pci_device_id rdc_pata_id_table[] = { +- { 0x17F3, 0x1011, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RDC_17F31011}, +- { 0x17F3, 0x1012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RDC_17F31012}, +- { } /* terminate list */ ++ { 0x17F3, 0x1011, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RDC_17F31011}, ++ { 0x17F3, 0x1012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RDC_17F31012}, ++ { } /* terminate list */ + }; + + MODULE_LICENSE("GPL"); --- a/drivers/staging/pata_rdc/pata_rdc.h +++ b/drivers/staging/pata_rdc/pata_rdc.h @@ -2,139 +2,138 @@ diff --git a/usb/usb-cp210x-add-device-ids.patch b/usb/usb-cp210x-add-device-ids.patch deleted file mode 100644 index bb96d90f07399e..00000000000000 --- a/usb/usb-cp210x-add-device-ids.patch +++ /dev/null @@ -1,58 +0,0 @@ -From craig@microtron.org.uk Tue Jun 2 15:03:05 2009 -From: Craig Shelley <craig@microtron.org.uk> -Date: Sat, 30 May 2009 00:16:44 +0100 -Subject: USB: CP210X Add device IDs -To: greg@kroah.com -Message-ID: <1243644934868126087@teratron> - - - -Signed-off-by: Craig Shelley <craig@microtron.org.uk> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/cp210x.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/serial/cp210x.c -+++ b/drivers/usb/serial/cp210x.c -@@ -58,13 +58,16 @@ static int debug; - static struct usb_device_id id_table [] = { - { USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */ - { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ -+ { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ - { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ -+ { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ - { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */ - { USB_DEVICE(0x0FCF, 0x1004) }, /* Dynastream ANT2USB */ - { USB_DEVICE(0x0FCF, 0x1006) }, /* Dynastream ANT development board */ - { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */ - { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */ - { USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */ -+ { USB_DEVICE(0x10C4, 0x0F91) }, /* Vstabi */ - { USB_DEVICE(0x10C4, 0x800A) }, /* SPORTident BSM7-D-USB main station */ - { USB_DEVICE(0x10C4, 0x803B) }, /* Pololu USB-serial converter */ - { USB_DEVICE(0x10C4, 0x8053) }, /* Enfora EDG1228 */ -@@ -85,10 +88,12 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */ - { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */ - { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */ -+ { USB_DEVICE(0x10C4, 0x81F2) }, /* C1007 HF band RFID controller */ - { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */ - { USB_DEVICE(0x10C4, 0x822B) }, /* Modem EDGE(GSM) Comander 2 */ - { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demostration module */ - { USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */ -+ { USB_DEVICE(0x10C4, 0x82F9) }, /* Procyon AVS */ - { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */ - { USB_DEVICE(0x10C4, 0x83A8) }, /* Amber Wireless AMB2560 */ - { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */ -@@ -99,7 +104,9 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x10C4, 0xF003) }, /* Elan Digital Systems USBpulse100 */ - { USB_DEVICE(0x10C4, 0xF004) }, /* Elan Digital Systems USBcount50 */ - { USB_DEVICE(0x10C5, 0xEA61) }, /* Silicon Labs MobiData GPRS USB Modem */ -+ { USB_DEVICE(0x10CE, 0xEA6A) }, /* Silicon Labs MobiData GPRS USB Modem 100EU */ - { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */ -+ { USB_DEVICE(0x1555, 0x0004) }, /* Owen AC4 USB-RS485 Converter */ - { USB_DEVICE(0x166A, 0x0303) }, /* Clipsal 5500PCU C-Bus USB interface */ - { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */ - { USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */ diff --git a/usb/usb-cp210x-replace-cp2101-with-cp210x.patch b/usb/usb-cp210x-replace-cp2101-with-cp210x.patch deleted file mode 100644 index 9bae3caa9ca29b..00000000000000 --- a/usb/usb-cp210x-replace-cp2101-with-cp210x.patch +++ /dev/null @@ -1,571 +0,0 @@ -From craig@microtron.org.uk Tue Jun 2 15:04:13 2009 -From: Craig Shelley <craig@microtron.org.uk> -Date: Sat, 30 May 2009 01:21:55 +0100 -Subject: USB: CP210X Replace CP2101 with CP210x -To: greg@kroah.com -Message-ID: <1243645038422095957@teratron> - - -This patch replaces the string "CP2101" with "CP210x" within cp210x.c -This is to reduce confusion about the fact that the driver is actually -compatible with CP2101, CP2102 and CP2103 devices. - -Signed-off-by: Craig Shelley <craig@microtron.org.uk> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/cp210x.c | 194 ++++++++++++++++++++++---------------------- - 1 file changed, 97 insertions(+), 97 deletions(-) - ---- a/drivers/usb/serial/cp210x.c -+++ b/drivers/usb/serial/cp210x.c -@@ -1,5 +1,5 @@ - /* -- * Silicon Laboratories CP2101/CP2102 USB to RS232 serial adaptor driver -+ * Silicon Laboratories CP210x USB to RS232 serial adaptor driver - * - * Copyright (C) 2005 Craig Shelley (craig@microtron.org.uk) - * -@@ -28,30 +28,30 @@ - * Version Information - */ - #define DRIVER_VERSION "v0.09" --#define DRIVER_DESC "Silicon Labs CP2101/CP2102 RS232 serial adaptor driver" -+#define DRIVER_DESC "Silicon Labs CP210x RS232 serial adaptor driver" - - /* - * Function Prototypes - */ --static int cp2101_open(struct tty_struct *, struct usb_serial_port *, -+static int cp210x_open(struct tty_struct *, struct usb_serial_port *, - struct file *); --static void cp2101_cleanup(struct usb_serial_port *); --static void cp2101_close(struct tty_struct *, struct usb_serial_port *, -+static void cp210x_cleanup(struct usb_serial_port *); -+static void cp210x_close(struct tty_struct *, struct usb_serial_port *, - struct file*); --static void cp2101_get_termios(struct tty_struct *, -+static void cp210x_get_termios(struct tty_struct *, - struct usb_serial_port *port); --static void cp2101_get_termios_port(struct usb_serial_port *port, -+static void cp210x_get_termios_port(struct usb_serial_port *port, - unsigned int *cflagp, unsigned int *baudp); --static void cp2101_set_termios(struct tty_struct *, struct usb_serial_port *, -+static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *, - struct ktermios*); --static int cp2101_tiocmget(struct tty_struct *, struct file *); --static int cp2101_tiocmset(struct tty_struct *, struct file *, -+static int cp210x_tiocmget(struct tty_struct *, struct file *); -+static int cp210x_tiocmset(struct tty_struct *, struct file *, - unsigned int, unsigned int); --static int cp2101_tiocmset_port(struct usb_serial_port *port, struct file *, -+static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *, - unsigned int, unsigned int); --static void cp2101_break_ctl(struct tty_struct *, int); --static int cp2101_startup(struct usb_serial *); --static void cp2101_shutdown(struct usb_serial *); -+static void cp210x_break_ctl(struct tty_struct *, int); -+static int cp210x_startup(struct usb_serial *); -+static void cp210x_shutdown(struct usb_serial *); - - static int debug; - -@@ -115,30 +115,30 @@ static struct usb_device_id id_table [] - - MODULE_DEVICE_TABLE(usb, id_table); - --static struct usb_driver cp2101_driver = { -- .name = "cp2101", -+static struct usb_driver cp210x_driver = { -+ .name = "cp210x", - .probe = usb_serial_probe, - .disconnect = usb_serial_disconnect, - .id_table = id_table, - .no_dynamic_id = 1, - }; - --static struct usb_serial_driver cp2101_device = { -+static struct usb_serial_driver cp210x_device = { - .driver = { - .owner = THIS_MODULE, -- .name = "cp2101", -+ .name = "cp210x", - }, -- .usb_driver = &cp2101_driver, -+ .usb_driver = &cp210x_driver, - .id_table = id_table, - .num_ports = 1, -- .open = cp2101_open, -- .close = cp2101_close, -- .break_ctl = cp2101_break_ctl, -- .set_termios = cp2101_set_termios, -- .tiocmget = cp2101_tiocmget, -- .tiocmset = cp2101_tiocmset, -- .attach = cp2101_startup, -- .shutdown = cp2101_shutdown, -+ .open = cp210x_open, -+ .close = cp210x_close, -+ .break_ctl = cp210x_break_ctl, -+ .set_termios = cp210x_set_termios, -+ .tiocmget = cp210x_tiocmget, -+ .tiocmset = cp210x_tiocmset, -+ .attach = cp210x_startup, -+ .shutdown = cp210x_shutdown, - }; - - /* Config request types */ -@@ -213,13 +213,13 @@ static struct usb_serial_driver cp2101_d - #define CONTROL_WRITE_RTS 0x0200 - - /* -- * cp2101_get_config -- * Reads from the CP2101 configuration registers -+ * cp210x_get_config -+ * Reads from the CP210x configuration registers - * 'size' is specified in bytes. - * '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 cp2101_get_config(struct usb_serial_port *port, u8 request, -+static int cp210x_get_config(struct usb_serial_port *port, u8 request, - unsigned int *data, int size) - { - struct usb_serial *serial = port->serial; -@@ -257,12 +257,12 @@ static int cp2101_get_config(struct usb_ - } - - /* -- * cp2101_set_config -- * Writes to the CP2101 configuration registers -+ * cp210x_set_config -+ * Writes to the CP210x configuration registers - * Values less than 16 bits wide are sent directly - * 'size' is specified in bytes. - */ --static int cp2101_set_config(struct usb_serial_port *port, u8 request, -+static int cp210x_set_config(struct usb_serial_port *port, u8 request, - unsigned int *data, int size) - { - struct usb_serial *serial = port->serial; -@@ -313,21 +313,21 @@ static int cp2101_set_config(struct usb_ - } - - /* -- * cp2101_set_config_single -- * Convenience function for calling cp2101_set_config on single data values -+ * cp210x_set_config_single -+ * Convenience function for calling cp210x_set_config on single data values - * without requiring an integer pointer - */ --static inline int cp2101_set_config_single(struct usb_serial_port *port, -+static inline int cp210x_set_config_single(struct usb_serial_port *port, - u8 request, unsigned int data) - { -- return cp2101_set_config(port, request, &data, 2); -+ return cp210x_set_config(port, request, &data, 2); - } - - /* -- * cp2101_quantise_baudrate -+ * cp210x_quantise_baudrate - * Quantises the baud rate as per AN205 Table 1 - */ --static unsigned int cp2101_quantise_baudrate(unsigned int baud) { -+static unsigned int cp210x_quantise_baudrate(unsigned int baud) { - if (baud <= 56) baud = 0; - else if (baud <= 300) baud = 300; - else if (baud <= 600) baud = 600; -@@ -364,7 +364,7 @@ static unsigned int cp2101_quantise_baud - return baud; - } - --static int cp2101_open(struct tty_struct *tty, struct usb_serial_port *port, -+static int cp210x_open(struct tty_struct *tty, struct usb_serial_port *port, - struct file *filp) - { - struct usb_serial *serial = port->serial; -@@ -372,7 +372,7 @@ static int cp2101_open(struct tty_struct - - dbg("%s - port %d", __func__, port->number); - -- if (cp2101_set_config_single(port, CP210X_IFC_ENABLE, UART_ENABLE)) { -+ if (cp210x_set_config_single(port, CP210X_IFC_ENABLE, UART_ENABLE)) { - dev_err(&port->dev, "%s - Unable to enable UART\n", - __func__); - return -EPROTO; -@@ -394,17 +394,17 @@ static int cp2101_open(struct tty_struct - } - - /* Configure the termios structure */ -- cp2101_get_termios(tty, port); -+ cp210x_get_termios(tty, port); - - /* Set the DTR and RTS pins low */ -- cp2101_tiocmset_port(tty ? (struct usb_serial_port *) tty->driver_data -+ cp210x_tiocmset_port(tty ? (struct usb_serial_port *) tty->driver_data - : port, - NULL, TIOCM_DTR | TIOCM_RTS, 0); - - return 0; - } - --static void cp2101_cleanup(struct usb_serial_port *port) -+static void cp210x_cleanup(struct usb_serial_port *port) - { - struct usb_serial *serial = port->serial; - -@@ -419,7 +419,7 @@ static void cp2101_cleanup(struct usb_se - } - } - --static void cp2101_close(struct tty_struct *tty, struct usb_serial_port *port, -+static void cp210x_close(struct tty_struct *tty, struct usb_serial_port *port, - struct file *filp) - { - dbg("%s - port %d", __func__, port->number); -@@ -431,23 +431,23 @@ static void cp2101_close(struct tty_stru - - mutex_lock(&port->serial->disc_mutex); - if (!port->serial->disconnected) -- cp2101_set_config_single(port, CP210X_IFC_ENABLE, UART_DISABLE); -+ cp210x_set_config_single(port, CP210X_IFC_ENABLE, UART_DISABLE); - mutex_unlock(&port->serial->disc_mutex); - } - - /* -- * cp2101_get_termios -+ * cp210x_get_termios - * Reads the baud rate, data bits, parity, stop bits and flow control mode - * from the device, corrects any unsupported values, and configures the - * termios structure to reflect the state of the device - */ --static void cp2101_get_termios(struct tty_struct *tty, -+static void cp210x_get_termios(struct tty_struct *tty, - struct usb_serial_port *port) - { - unsigned int baud; - - if (tty) { -- cp2101_get_termios_port(tty->driver_data, -+ cp210x_get_termios_port(tty->driver_data, - &tty->termios->c_cflag, &baud); - tty_encode_baud_rate(tty, baud, baud); - } -@@ -455,15 +455,15 @@ static void cp2101_get_termios(struct tt - else { - unsigned int cflag; - cflag = 0; -- cp2101_get_termios_port(port, &cflag, &baud); -+ cp210x_get_termios_port(port, &cflag, &baud); - } - } - - /* -- * cp2101_get_termios_port -- * This is the heart of cp2101_get_termios which always uses a &usb_serial_port. -+ * cp210x_get_termios_port -+ * This is the heart of cp210x_get_termios which always uses a &usb_serial_port. - */ --static void cp2101_get_termios_port(struct usb_serial_port *port, -+static void cp210x_get_termios_port(struct usb_serial_port *port, - unsigned int *cflagp, unsigned int *baudp) - { - unsigned int cflag, modem_ctl[4]; -@@ -472,17 +472,17 @@ static void cp2101_get_termios_port(stru - - dbg("%s - port %d", __func__, port->number); - -- cp2101_get_config(port, CP210X_GET_BAUDDIV, &baud, 2); -+ cp210x_get_config(port, CP210X_GET_BAUDDIV, &baud, 2); - /* Convert to baudrate */ - if (baud) -- baud = cp2101_quantise_baudrate((BAUD_RATE_GEN_FREQ + baud/2)/ baud); -+ baud = cp210x_quantise_baudrate((BAUD_RATE_GEN_FREQ + baud/2)/ baud); - - dbg("%s - baud rate = %d", __func__, baud); - *baudp = baud; - - cflag = *cflagp; - -- cp2101_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); -+ cp210x_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); - cflag &= ~CSIZE; - switch (bits & BITS_DATA_MASK) { - case BITS_DATA_5: -@@ -507,14 +507,14 @@ static void cp2101_get_termios_port(stru - cflag |= CS8; - bits &= ~BITS_DATA_MASK; - bits |= BITS_DATA_8; -- cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); -+ cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - default: - dbg("%s - Unknown number of data bits, using 8", __func__); - cflag |= CS8; - bits &= ~BITS_DATA_MASK; - bits |= BITS_DATA_8; -- cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); -+ cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - } - -@@ -537,20 +537,20 @@ static void cp2101_get_termios_port(stru - __func__); - cflag &= ~PARENB; - bits &= ~BITS_PARITY_MASK; -- cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); -+ cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - case BITS_PARITY_SPACE: - dbg("%s - parity = SPACE (not supported, disabling parity)", - __func__); - cflag &= ~PARENB; - bits &= ~BITS_PARITY_MASK; -- cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); -+ cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - default: - dbg("%s - Unknown parity mode, disabling parity", __func__); - cflag &= ~PARENB; - bits &= ~BITS_PARITY_MASK; -- cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); -+ cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - } - -@@ -563,7 +563,7 @@ static void cp2101_get_termios_port(stru - dbg("%s - stop bits = 1.5 (not supported, using 1 stop bit)", - __func__); - bits &= ~BITS_STOP_MASK; -- cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); -+ cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - case BITS_STOP_2: - dbg("%s - stop bits = 2", __func__); -@@ -573,11 +573,11 @@ static void cp2101_get_termios_port(stru - dbg("%s - Unknown number of stop bits, using 1 stop bit", - __func__); - bits &= ~BITS_STOP_MASK; -- cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); -+ cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - } - -- cp2101_get_config(port, CP210X_GET_FLOW, modem_ctl, 16); -+ cp210x_get_config(port, CP210X_GET_FLOW, modem_ctl, 16); - if (modem_ctl[0] & 0x0008) { - dbg("%s - flow control = CRTSCTS", __func__); - cflag |= CRTSCTS; -@@ -589,7 +589,7 @@ static void cp2101_get_termios_port(stru - *cflagp = cflag; - } - --static void cp2101_set_termios(struct tty_struct *tty, -+static void cp210x_set_termios(struct tty_struct *tty, - struct usb_serial_port *port, struct ktermios *old_termios) - { - unsigned int cflag, old_cflag; -@@ -604,13 +604,13 @@ static void cp2101_set_termios(struct tt - tty->termios->c_cflag &= ~CMSPAR; - cflag = tty->termios->c_cflag; - old_cflag = old_termios->c_cflag; -- baud = cp2101_quantise_baudrate(tty_get_baud_rate(tty)); -+ 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 (cp2101_set_config_single(port, CP210X_SET_BAUDDIV, -+ if (cp210x_set_config_single(port, CP210X_SET_BAUDDIV, - ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) { - dbg("Baud rate requested not supported by device\n"); - baud = tty_termios_baud_rate(old_termios); -@@ -621,7 +621,7 @@ static void cp2101_set_termios(struct tt - - /* If the number of data bits is to be updated */ - if ((cflag & CSIZE) != (old_cflag & CSIZE)) { -- cp2101_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); -+ cp210x_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); - bits &= ~BITS_DATA_MASK; - switch (cflag & CSIZE) { - case CS5: -@@ -645,19 +645,19 @@ static void cp2101_set_termios(struct tt - dbg("%s - data bits = 9", __func__); - break;*/ - default: -- dbg("cp2101 driver does not " -+ dbg("cp210x driver does not " - "support the number of bits requested," - " using 8 bit mode\n"); - bits |= BITS_DATA_8; - break; - } -- if (cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2)) -+ if (cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2)) - dbg("Number of data bits requested " - "not supported by device\n"); - } - - if ((cflag & (PARENB|PARODD)) != (old_cflag & (PARENB|PARODD))) { -- cp2101_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); -+ cp210x_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); - bits &= ~BITS_PARITY_MASK; - if (cflag & PARENB) { - if (cflag & PARODD) { -@@ -668,13 +668,13 @@ static void cp2101_set_termios(struct tt - dbg("%s - parity = EVEN", __func__); - } - } -- if (cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2)) -+ if (cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2)) - dbg("Parity mode not supported " - "by device\n"); - } - - if ((cflag & CSTOPB) != (old_cflag & CSTOPB)) { -- cp2101_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); -+ cp210x_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); - bits &= ~BITS_STOP_MASK; - if (cflag & CSTOPB) { - bits |= BITS_STOP_2; -@@ -683,13 +683,13 @@ static void cp2101_set_termios(struct tt - bits |= BITS_STOP_1; - dbg("%s - stop bits = 1", __func__); - } -- if (cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2)) -+ if (cp210x_set_config(port, CP210X_SET_LINE_CTL, &bits, 2)) - dbg("Number of stop bits requested " - "not supported by device\n"); - } - - if ((cflag & CRTSCTS) != (old_cflag & CRTSCTS)) { -- cp2101_get_config(port, CP210X_GET_FLOW, modem_ctl, 16); -+ cp210x_get_config(port, CP210X_GET_FLOW, 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]); -@@ -709,19 +709,19 @@ static void cp2101_set_termios(struct tt - 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]); -- cp2101_set_config(port, CP210X_SET_FLOW, modem_ctl, 16); -+ cp210x_set_config(port, CP210X_SET_FLOW, modem_ctl, 16); - } - - } - --static int cp2101_tiocmset (struct tty_struct *tty, struct file *file, -+static int cp210x_tiocmset (struct tty_struct *tty, struct file *file, - unsigned int set, unsigned int clear) - { - struct usb_serial_port *port = tty->driver_data; -- return cp2101_tiocmset_port(port, file, set, clear); -+ return cp210x_tiocmset_port(port, file, set, clear); - } - --static int cp2101_tiocmset_port(struct usb_serial_port *port, struct file *file, -+static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *file, - unsigned int set, unsigned int clear) - { - unsigned int control = 0; -@@ -747,10 +747,10 @@ static int cp2101_tiocmset_port(struct u - - dbg("%s - control = 0x%.4x", __func__, control); - -- return cp2101_set_config(port, CP210X_SET_MHS, &control, 2); -+ return cp210x_set_config(port, CP210X_SET_MHS, &control, 2); - } - --static int cp2101_tiocmget (struct tty_struct *tty, struct file *file) -+static int cp210x_tiocmget (struct tty_struct *tty, struct file *file) - { - struct usb_serial_port *port = tty->driver_data; - unsigned int control; -@@ -758,7 +758,7 @@ static int cp2101_tiocmget (struct tty_s - - dbg("%s - port %d", __func__, port->number); - -- cp2101_get_config(port, CP210X_GET_MDMSTS, &control, 1); -+ cp210x_get_config(port, CP210X_GET_MDMSTS, &control, 1); - - result = ((control & CONTROL_DTR) ? TIOCM_DTR : 0) - |((control & CONTROL_RTS) ? TIOCM_RTS : 0) -@@ -772,7 +772,7 @@ static int cp2101_tiocmget (struct tty_s - return result; - } - --static void cp2101_break_ctl (struct tty_struct *tty, int break_state) -+static void cp210x_break_ctl (struct tty_struct *tty, int break_state) - { - struct usb_serial_port *port = tty->driver_data; - unsigned int state; -@@ -784,17 +784,17 @@ static void cp2101_break_ctl (struct tty - state = BREAK_ON; - dbg("%s - turning break %s", __func__, - state == BREAK_OFF ? "off" : "on"); -- cp2101_set_config(port, CP210X_SET_BREAK, &state, 2); -+ cp210x_set_config(port, CP210X_SET_BREAK, &state, 2); - } - --static int cp2101_startup(struct usb_serial *serial) -+static int cp210x_startup(struct usb_serial *serial) - { -- /* CP2101 buffers behave strangely unless device is reset */ -+ /* cp210x buffers behave strangely unless device is reset */ - usb_reset_device(serial->dev); - return 0; - } - --static void cp2101_shutdown(struct usb_serial *serial) -+static void cp210x_shutdown(struct usb_serial *serial) - { - int i; - -@@ -802,21 +802,21 @@ static void cp2101_shutdown(struct usb_s - - /* Stop reads and writes on all ports */ - for (i = 0; i < serial->num_ports; ++i) -- cp2101_cleanup(serial->port[i]); -+ cp210x_cleanup(serial->port[i]); - } - --static int __init cp2101_init(void) -+static int __init cp210x_init(void) - { - int retval; - -- retval = usb_serial_register(&cp2101_device); -+ retval = usb_serial_register(&cp210x_device); - if (retval) - return retval; /* Failed to register */ - -- retval = usb_register(&cp2101_driver); -+ retval = usb_register(&cp210x_driver); - if (retval) { - /* Failed to register */ -- usb_serial_deregister(&cp2101_device); -+ usb_serial_deregister(&cp210x_device); - return retval; - } - -@@ -826,14 +826,14 @@ static int __init cp2101_init(void) - return 0; - } - --static void __exit cp2101_exit(void) -+static void __exit cp210x_exit(void) - { -- usb_deregister(&cp2101_driver); -- usb_serial_deregister(&cp2101_device); -+ usb_deregister(&cp210x_driver); -+ usb_serial_deregister(&cp210x_device); - } - --module_init(cp2101_init); --module_exit(cp2101_exit); -+module_init(cp210x_init); -+module_exit(cp210x_exit); - - MODULE_DESCRIPTION(DRIVER_DESC); - MODULE_VERSION(DRIVER_VERSION); diff --git a/usb/usb-cp210x-use-official-request-code-definitions.patch b/usb/usb-cp210x-use-official-request-code-definitions.patch deleted file mode 100644 index be81717a7457c0..00000000000000 --- a/usb/usb-cp210x-use-official-request-code-definitions.patch +++ /dev/null @@ -1,312 +0,0 @@ -From craig@microtron.org.uk Tue Jun 2 15:03:59 2009 -From: Craig Shelley <craig@microtron.org.uk> -Date: Sat, 30 May 2009 01:01:30 +0100 -Subject: USB: CP210X Use official request code definitions -To: greg@kroah.com -Message-ID: <1243644979751842277@teratron> - - -The CP210X driver was developed without official device specifications. -This has lead to an incorrect assumption that all GET request codes are -equal to the corresponding SET request code +1. -This patch removes this incorrect assumption, and uses request code -definitions based on the updated GPL driver from SiLabs. -This modification is needed before extended functionality such as GPIO -on CP2103 can be supported. - -Signed-off-by: Craig Shelley <craig@microtron.org.uk> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/cp210x.c | 96 +++++++++++++++++++++++++------------------- - 1 file changed, 55 insertions(+), 41 deletions(-) - ---- a/drivers/usb/serial/cp210x.c -+++ b/drivers/usb/serial/cp210x.c -@@ -27,7 +27,7 @@ - /* - * Version Information - */ --#define DRIVER_VERSION "v0.08" -+#define DRIVER_VERSION "v0.09" - #define DRIVER_DESC "Silicon Labs CP2101/CP2102 RS232 serial adaptor driver" - - /* -@@ -145,23 +145,40 @@ static struct usb_serial_driver cp2101_d - #define REQTYPE_HOST_TO_DEVICE 0x41 - #define REQTYPE_DEVICE_TO_HOST 0xc1 - --/* Config SET requests. To GET, add 1 to the request number */ --#define CP2101_UART 0x00 /* Enable / Disable */ --#define CP2101_BAUDRATE 0x01 /* (BAUD_RATE_GEN_FREQ / baudrate) */ --#define CP2101_BITS 0x03 /* 0x(0)(databits)(parity)(stopbits) */ --#define CP2101_BREAK 0x05 /* On / Off */ --#define CP2101_CONTROL 0x07 /* Flow control line states */ --#define CP2101_MODEMCTL 0x13 /* Modem controls */ --#define CP2101_CONFIG_6 0x19 /* 6 bytes of config data ??? */ -+/* Config request codes */ -+#define CP210X_IFC_ENABLE 0x00 -+#define CP210X_SET_BAUDDIV 0x01 -+#define CP210X_GET_BAUDDIV 0x02 -+#define CP210X_SET_LINE_CTL 0x03 -+#define CP210X_GET_LINE_CTL 0x04 -+#define CP210X_SET_BREAK 0x05 -+#define CP210X_IMM_CHAR 0x06 -+#define CP210X_SET_MHS 0x07 -+#define CP210X_GET_MDMSTS 0x08 -+#define CP210X_SET_XON 0x09 -+#define CP210X_SET_XOFF 0x0A -+#define CP210X_SET_EVENTMASK 0x0B -+#define CP210X_GET_EVENTMASK 0x0C -+#define CP210X_SET_CHAR 0x0D -+#define CP210X_GET_CHARS 0x0E -+#define CP210X_GET_PROPS 0x0F -+#define CP210X_GET_COMM_STATUS 0x10 -+#define CP210X_RESET 0x11 -+#define CP210X_PURGE 0x12 -+#define CP210X_SET_FLOW 0x13 -+#define CP210X_GET_FLOW 0x14 -+#define CP210X_EMBED_EVENTS 0x15 -+#define CP210X_GET_EVENTSTATE 0x16 -+#define CP210X_SET_CHARS 0x19 - --/* CP2101_UART */ -+/* CP210X_IFC_ENABLE */ - #define UART_ENABLE 0x0001 - #define UART_DISABLE 0x0000 - --/* CP2101_BAUDRATE */ -+/* CP210X_(SET|GET)_BAUDDIV */ - #define BAUD_RATE_GEN_FREQ 0x384000 - --/* CP2101_BITS */ -+/* CP210X_(SET|GET)_LINE_CTL */ - #define BITS_DATA_MASK 0X0f00 - #define BITS_DATA_5 0X0500 - #define BITS_DATA_6 0X0600 -@@ -181,11 +198,11 @@ static struct usb_serial_driver cp2101_d - #define BITS_STOP_1_5 0x0001 - #define BITS_STOP_2 0x0002 - --/* CP2101_BREAK */ -+/* CP210X_SET_BREAK */ - #define BREAK_ON 0x0000 - #define BREAK_OFF 0x0001 - --/* CP2101_CONTROL */ -+/* CP210X_(SET_MHS|GET_MDMSTS) */ - #define CONTROL_DTR 0x0001 - #define CONTROL_RTS 0x0002 - #define CONTROL_CTS 0x0010 -@@ -218,9 +235,6 @@ static int cp2101_get_config(struct usb_ - return -ENOMEM; - } - -- /* For get requests, the request number must be incremented */ -- request++; -- - /* 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, -@@ -358,7 +372,7 @@ static int cp2101_open(struct tty_struct - - dbg("%s - port %d", __func__, port->number); - -- if (cp2101_set_config_single(port, CP2101_UART, UART_ENABLE)) { -+ if (cp2101_set_config_single(port, CP210X_IFC_ENABLE, UART_ENABLE)) { - dev_err(&port->dev, "%s - Unable to enable UART\n", - __func__); - return -EPROTO; -@@ -417,7 +431,7 @@ static void cp2101_close(struct tty_stru - - mutex_lock(&port->serial->disc_mutex); - if (!port->serial->disconnected) -- cp2101_set_config_single(port, CP2101_UART, UART_DISABLE); -+ cp2101_set_config_single(port, CP210X_IFC_ENABLE, UART_DISABLE); - mutex_unlock(&port->serial->disc_mutex); - } - -@@ -458,7 +472,7 @@ static void cp2101_get_termios_port(stru - - dbg("%s - port %d", __func__, port->number); - -- cp2101_get_config(port, CP2101_BAUDRATE, &baud, 2); -+ cp2101_get_config(port, CP210X_GET_BAUDDIV, &baud, 2); - /* Convert to baudrate */ - if (baud) - baud = cp2101_quantise_baudrate((BAUD_RATE_GEN_FREQ + baud/2)/ baud); -@@ -468,7 +482,7 @@ static void cp2101_get_termios_port(stru - - cflag = *cflagp; - -- cp2101_get_config(port, CP2101_BITS, &bits, 2); -+ cp2101_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); - cflag &= ~CSIZE; - switch (bits & BITS_DATA_MASK) { - case BITS_DATA_5: -@@ -493,14 +507,14 @@ static void cp2101_get_termios_port(stru - cflag |= CS8; - bits &= ~BITS_DATA_MASK; - bits |= BITS_DATA_8; -- cp2101_set_config(port, CP2101_BITS, &bits, 2); -+ cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - default: - dbg("%s - Unknown number of data bits, using 8", __func__); - cflag |= CS8; - bits &= ~BITS_DATA_MASK; - bits |= BITS_DATA_8; -- cp2101_set_config(port, CP2101_BITS, &bits, 2); -+ cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - } - -@@ -523,20 +537,20 @@ static void cp2101_get_termios_port(stru - __func__); - cflag &= ~PARENB; - bits &= ~BITS_PARITY_MASK; -- cp2101_set_config(port, CP2101_BITS, &bits, 2); -+ cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - case BITS_PARITY_SPACE: - dbg("%s - parity = SPACE (not supported, disabling parity)", - __func__); - cflag &= ~PARENB; - bits &= ~BITS_PARITY_MASK; -- cp2101_set_config(port, CP2101_BITS, &bits, 2); -+ cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - default: - dbg("%s - Unknown parity mode, disabling parity", __func__); - cflag &= ~PARENB; - bits &= ~BITS_PARITY_MASK; -- cp2101_set_config(port, CP2101_BITS, &bits, 2); -+ cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - } - -@@ -549,7 +563,7 @@ static void cp2101_get_termios_port(stru - dbg("%s - stop bits = 1.5 (not supported, using 1 stop bit)", - __func__); - bits &= ~BITS_STOP_MASK; -- cp2101_set_config(port, CP2101_BITS, &bits, 2); -+ cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - case BITS_STOP_2: - dbg("%s - stop bits = 2", __func__); -@@ -559,11 +573,11 @@ static void cp2101_get_termios_port(stru - dbg("%s - Unknown number of stop bits, using 1 stop bit", - __func__); - bits &= ~BITS_STOP_MASK; -- cp2101_set_config(port, CP2101_BITS, &bits, 2); -+ cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2); - break; - } - -- cp2101_get_config(port, CP2101_MODEMCTL, modem_ctl, 16); -+ cp2101_get_config(port, CP210X_GET_FLOW, modem_ctl, 16); - if (modem_ctl[0] & 0x0008) { - dbg("%s - flow control = CRTSCTS", __func__); - cflag |= CRTSCTS; -@@ -596,7 +610,7 @@ static void cp2101_set_termios(struct tt - if (baud != tty_termios_baud_rate(old_termios) && baud != 0) { - dbg("%s - Setting baud rate to %d baud", __func__, - baud); -- if (cp2101_set_config_single(port, CP2101_BAUDRATE, -+ if (cp2101_set_config_single(port, CP210X_SET_BAUDDIV, - ((BAUD_RATE_GEN_FREQ + baud/2) / baud))) { - dbg("Baud rate requested not supported by device\n"); - baud = tty_termios_baud_rate(old_termios); -@@ -607,7 +621,7 @@ static void cp2101_set_termios(struct tt - - /* If the number of data bits is to be updated */ - if ((cflag & CSIZE) != (old_cflag & CSIZE)) { -- cp2101_get_config(port, CP2101_BITS, &bits, 2); -+ cp2101_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); - bits &= ~BITS_DATA_MASK; - switch (cflag & CSIZE) { - case CS5: -@@ -637,13 +651,13 @@ static void cp2101_set_termios(struct tt - bits |= BITS_DATA_8; - break; - } -- if (cp2101_set_config(port, CP2101_BITS, &bits, 2)) -+ if (cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2)) - dbg("Number of data bits requested " - "not supported by device\n"); - } - - if ((cflag & (PARENB|PARODD)) != (old_cflag & (PARENB|PARODD))) { -- cp2101_get_config(port, CP2101_BITS, &bits, 2); -+ cp2101_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); - bits &= ~BITS_PARITY_MASK; - if (cflag & PARENB) { - if (cflag & PARODD) { -@@ -654,13 +668,13 @@ static void cp2101_set_termios(struct tt - dbg("%s - parity = EVEN", __func__); - } - } -- if (cp2101_set_config(port, CP2101_BITS, &bits, 2)) -+ if (cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2)) - dbg("Parity mode not supported " - "by device\n"); - } - - if ((cflag & CSTOPB) != (old_cflag & CSTOPB)) { -- cp2101_get_config(port, CP2101_BITS, &bits, 2); -+ cp2101_get_config(port, CP210X_GET_LINE_CTL, &bits, 2); - bits &= ~BITS_STOP_MASK; - if (cflag & CSTOPB) { - bits |= BITS_STOP_2; -@@ -669,13 +683,13 @@ static void cp2101_set_termios(struct tt - bits |= BITS_STOP_1; - dbg("%s - stop bits = 1", __func__); - } -- if (cp2101_set_config(port, CP2101_BITS, &bits, 2)) -+ if (cp2101_set_config(port, CP210X_SET_LINE_CTL, &bits, 2)) - dbg("Number of stop bits requested " - "not supported by device\n"); - } - - if ((cflag & CRTSCTS) != (old_cflag & CRTSCTS)) { -- cp2101_get_config(port, CP2101_MODEMCTL, modem_ctl, 16); -+ cp2101_get_config(port, CP210X_GET_FLOW, 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]); -@@ -695,7 +709,7 @@ static void cp2101_set_termios(struct tt - 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]); -- cp2101_set_config(port, CP2101_MODEMCTL, modem_ctl, 16); -+ cp2101_set_config(port, CP210X_SET_FLOW, modem_ctl, 16); - } - - } -@@ -733,7 +747,7 @@ static int cp2101_tiocmset_port(struct u - - dbg("%s - control = 0x%.4x", __func__, control); - -- return cp2101_set_config(port, CP2101_CONTROL, &control, 2); -+ return cp2101_set_config(port, CP210X_SET_MHS, &control, 2); - } - - static int cp2101_tiocmget (struct tty_struct *tty, struct file *file) -@@ -744,7 +758,7 @@ static int cp2101_tiocmget (struct tty_s - - dbg("%s - port %d", __func__, port->number); - -- cp2101_get_config(port, CP2101_CONTROL, &control, 1); -+ cp2101_get_config(port, CP210X_GET_MDMSTS, &control, 1); - - result = ((control & CONTROL_DTR) ? TIOCM_DTR : 0) - |((control & CONTROL_RTS) ? TIOCM_RTS : 0) -@@ -770,7 +784,7 @@ static void cp2101_break_ctl (struct tty - state = BREAK_ON; - dbg("%s - turning break %s", __func__, - state == BREAK_OFF ? "off" : "on"); -- cp2101_set_config(port, CP2101_BREAK, &state, 2); -+ cp2101_set_config(port, CP210X_SET_BREAK, &state, 2); - } - - static int cp2101_startup(struct usb_serial *serial) @@ -1 +1 @@ -2.6.30-rc7 +2.6.30-rc8 |