mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
sunsu: Use sunserial_console_termios() in sunsu_console_setup().
Be like the other Sun serial drivers otherwise the special handling of OpenFirmware options and hard-coded overrides for LOM/RSC consoles will not be handled. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
1917d17b90
commit
be24656a5e
1 changed files with 10 additions and 7 deletions
|
@ -1329,11 +1329,9 @@ static void sunsu_console_write(struct console *co, const char *s,
|
||||||
*/
|
*/
|
||||||
static int __init sunsu_console_setup(struct console *co, char *options)
|
static int __init sunsu_console_setup(struct console *co, char *options)
|
||||||
{
|
{
|
||||||
|
static struct ktermios dummy;
|
||||||
|
struct ktermios termios;
|
||||||
struct uart_port *port;
|
struct uart_port *port;
|
||||||
int baud = 9600;
|
|
||||||
int bits = 8;
|
|
||||||
int parity = 'n';
|
|
||||||
int flow = 'n';
|
|
||||||
|
|
||||||
printk("Console: ttyS%d (SU)\n",
|
printk("Console: ttyS%d (SU)\n",
|
||||||
(sunsu_reg.minor - 64) + co->index);
|
(sunsu_reg.minor - 64) + co->index);
|
||||||
|
@ -1352,10 +1350,15 @@ static int __init sunsu_console_setup(struct console *co, char *options)
|
||||||
*/
|
*/
|
||||||
spin_lock_init(&port->lock);
|
spin_lock_init(&port->lock);
|
||||||
|
|
||||||
if (options)
|
/* Get firmware console settings. */
|
||||||
uart_parse_options(options, &baud, &parity, &bits, &flow);
|
sunserial_console_termios(co, to_of_device(port->dev)->node);
|
||||||
|
|
||||||
return uart_set_options(port, co, baud, parity, bits, flow);
|
memset(&termios, 0, sizeof(struct ktermios));
|
||||||
|
termios.c_cflag = co->cflag;
|
||||||
|
port->mctrl |= TIOCM_DTR;
|
||||||
|
port->ops->set_termios(port, &termios, &dummy);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct console sunsu_console = {
|
static struct console sunsu_console = {
|
||||||
|
|
Loading…
Reference in a new issue