aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-01 12:18:25 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-01 12:18:25 -0400
commit233c3dda5cd1bb26fa871b94db17627117e51026 (patch)
treefb9451a912642f90fb3f9e5cd3a6e5ec0faf1bc3 /drivers/usb/serial
parent281393ad0bcfc309434d2bff38abc15805c2cbc4 (diff)
Revert "usb: pl2303: add two comments concerning the supported baud rates with HX chips"
This reverts commit c23bda365dfbf56aa4d6d4a97f83136c36050e01. Revert all of the pl2303 changes that went into 3.12-rc1 and -rc2 as they cause regressions on some versions of the chip. This will all be revisited for later kernel versions when we can figure out how to handle this in a way that does not break working devices. Reported-by: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: Frank Schäfer <fschaefer.oss@googlemail.com> Acked-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/pl2303.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 6638c5d9079d..09fb55cf3be7 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -281,12 +281,6 @@ static int pl2303_baudrate_encode_direct(int baud, enum pl2303_type type,
281 4800, 7200, 9600, 14400, 19200, 28800, 38400, 281 4800, 7200, 9600, 14400, 19200, 28800, 38400,
282 57600, 115200, 230400, 460800, 614400, 921600, 282 57600, 115200, 230400, 460800, 614400, 921600,
283 1228800, 2457600, 3000000, 6000000 }; 283 1228800, 2457600, 3000000, 6000000 };
284 /*
285 * NOTE: The PL2303HX (tested with rev. 3A) also supports the following
286 * baud rates: 128000, 134400, 161280, 201600, 268800, 403200, 806400.
287 * As long as we are not using this encoding method for them, there is
288 * no point in complicating the code to support them.
289 */
290 int i; 284 int i;
291 285
292 /* Set baudrate to nearest supported value */ 286 /* Set baudrate to nearest supported value */
@@ -400,12 +394,6 @@ static void pl2303_encode_baudrate(struct tty_struct *tty,
400 * => supported by all chip types 394 * => supported by all chip types
401 * 2) Divisor based method: encodes a divisor to a base value (12MHz*32) 395 * 2) Divisor based method: encodes a divisor to a base value (12MHz*32)
402 * => supported by HX chips (and likely not by type_0/1 chips) 396 * => supported by HX chips (and likely not by type_0/1 chips)
403 *
404 * NOTE: Although the divisor based baud rate encoding method is much
405 * more flexible, some of the standard baud rate values can not be
406 * realized exactly. But the difference is very small (max. 0.2%) and
407 * the device likely uses the same baud rate generator for both methods
408 * so that there is likley no difference.
409 */ 397 */
410 if (type != HX) 398 if (type != HX)
411 baud = pl2303_baudrate_encode_direct(baud, type, buf); 399 baud = pl2303_baudrate_encode_direct(baud, type, buf);