Skip to content

L
linux-davinci
Commit b3e112bc authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/rmk/linux-2.6-serial

parents f647a274 0a8b80c5
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
drivers/serial/8250.c
View file @ b3e112bc
......@@ -1682,22 +1682,22 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios,
switch (termios->c_cflag & CSIZE) {
case CS5:
cval = 0x00;
cval = UART_LCR_WLEN5;
break;
case CS6:
cval = 0x01;
cval = UART_LCR_WLEN6;
break;
case CS7:
cval = 0x02;
cval = UART_LCR_WLEN7;
break;
default:
case CS8:
cval = 0x03;
cval = UART_LCR_WLEN8;
break;
}
if (termios->c_cflag & CSTOPB)
cval |= 0x04;
cval |= UART_LCR_STOP;
if (termios->c_cflag & PARENB)
cval |= UART_LCR_PARITY;
if (!(termios->c_cflag & PARODD))
......
drivers/serial/au1x00_uart.c
View file @ b3e112bc
......@@ -773,22 +773,22 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios,
switch (termios->c_cflag & CSIZE) {
case CS5:
cval = 0x00;
cval = UART_LCR_WLEN5;
break;
case CS6:
cval = 0x01;
cval = UART_LCR_WLEN6;
break;
case CS7:
cval = 0x02;
cval = UART_LCR_WLEN7;
break;
default:
case CS8:
cval = 0x03;
cval = UART_LCR_WLEN8;
break;
}
if (termios->c_cflag & CSTOPB)
cval |= 0x04;
cval |= UART_LCR_STOP;
if (termios->c_cflag & PARENB)
cval |= UART_LCR_PARITY;
if (!(termios->c_cflag & PARODD))
......
drivers/serial/m32r_sio.c
View file @ b3e112bc
......@@ -724,22 +724,22 @@ static void m32r_sio_set_termios(struct uart_port *port,
switch (termios->c_cflag & CSIZE) {
case CS5:
cval = 0x00;
cval = UART_LCR_WLEN5;
break;
case CS6:
cval = 0x01;
cval = UART_LCR_WLEN6;
break;
case CS7:
cval = 0x02;
cval = UART_LCR_WLEN7;
break;
default:
case CS8:
cval = 0x03;
cval = UART_LCR_WLEN8;
break;
}
if (termios->c_cflag & CSTOPB)
cval |= 0x04;
cval |= UART_LCR_STOP;
if (termios->c_cflag & PARENB)
cval |= UART_LCR_PARITY;
if (!(termios->c_cflag & PARODD))
......
drivers/serial/pxa.c
View file @ b3e112bc
......@@ -455,22 +455,22 @@ serial_pxa_set_termios(struct uart_port *port, struct termios *termios,
switch (termios->c_cflag & CSIZE) {
case CS5:
cval = 0x00;
cval = UART_LCR_WLEN5;
break;
case CS6:
cval = 0x01;
cval = UART_LCR_WLEN6;
break;
case CS7:
cval = 0x02;
cval = UART_LCR_WLEN7;
break;
default:
case CS8:
cval = 0x03;
cval = UART_LCR_WLEN8;
break;
}
if (termios->c_cflag & CSTOPB)
cval |= 0x04;
cval |= UART_LCR_STOP;
if (termios->c_cflag & PARENB)
cval |= UART_LCR_PARITY;
if (!(termios->c_cflag & PARODD))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment