hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

serial: core: remove baud_rates when serial console setup 

Currently, when tring to set up a serial console with a higher
baud rate, it would fallback to 921600.

Tested-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jeffy Chen 2016-01-04 15:54:46 +08:00 committed by Greg Kroah-Hartman
parent 92a0574867
commit ba47f97a18
1 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/tty/serial/serial_core.c
View File

@ -1875,26 +1875,6 @@ uart_parse_options(char *options, int *baud, int *parity, int *bits, int *flow)
} }
EXPORT_SYMBOL_GPL(uart_parse_options); EXPORT_SYMBOL_GPL(uart_parse_options);
struct baud_rates {
unsigned int rate;
unsigned int cflag;
};
static const struct baud_rates baud_rates[] = {
{ 921600, B921600 },
{ 460800, B460800 },
{ 230400, B230400 },
{ 115200, B115200 },
{ 57600, B57600 },
{ 38400, B38400 },
{ 19200, B19200 },
{ 9600, B9600 },
{ 4800, B4800 },
{ 2400, B2400 },
{ 1200, B1200 },
{ 0, B38400 }
};
/** /**
* uart_set_options - setup the serial console parameters * uart_set_options - setup the serial console parameters
* @port: pointer to the serial ports uart_port structure * @port: pointer to the serial ports uart_port structure
@ -1910,7 +1890,6 @@ uart_set_options(struct uart_port *port, struct console *co,
{ {
struct ktermios termios; struct ktermios termios;
static struct ktermios dummy; static struct ktermios dummy;
int i;
/* /*
* Ensure that the serial console lock is initialised * Ensure that the serial console lock is initialised
@ -1925,16 +1904,8 @@ uart_set_options(struct uart_port *port, struct console *co,
memset(&termios, 0, sizeof(struct ktermios)); memset(&termios, 0, sizeof(struct ktermios));
termios.c_cflag = CREAD | HUPCL | CLOCAL; termios.c_cflag |= CREAD | HUPCL | CLOCAL;
tty_termios_encode_baud_rate(&termios, baud, baud);
/*
* Construct a cflag setting.
*/
for (i = 0; baud_rates[i].rate; i++)
if (baud_rates[i].rate <= baud)
break;
termios.c_cflag |= baud_rates[i].cflag;
if (bits == 7) if (bits == 7)
termios.c_cflag |= CS7; termios.c_cflag |= CS7;