summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-24 14:12:50 -0800
committerDavid S. Miller <davem@davemloft.net>2009-11-24 14:12:50 -0800
commitbe24656a5e2d68bfd0744f0742c4aceef2cf44b5 (patch)
tree983ab949658fa0f492356e1da8d17edc9414df75 /drivers/serial
parent1917d17b903955b8b2903626a2e01d071a5d0ec9 (diff)
downloadop-kernel-dev-be24656a5e2d68bfd0744f0742c4aceef2cf44b5.zip
op-kernel-dev-be24656a5e2d68bfd0744f0742c4aceef2cf44b5.tar.gz
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>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/sunsu.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 4ee4167..170d3d6 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -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 struct ktermios dummy;
+ struct ktermios termios;
struct uart_port *port;
- int baud = 9600;
- int bits = 8;
- int parity = 'n';
- int flow = 'n';
printk("Console: ttyS%d (SU)\n",
(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);
- if (options)
- uart_parse_options(options, &baud, &parity, &bits, &flow);
+ /* Get firmware console settings. */
+ 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 = {
OpenPOWER on IntegriCloud