summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2014-02-17 13:12:54 +0100
committerStefan Agner <stefan.agner@toradex.com>2014-02-17 13:12:54 +0100
commit1c272deae1df4114d94c561bf2fe401b5c9ca6e4 (patch)
treeed7c2fa64dd2953fdbc7d1695fbb98d2202b837a /drivers
parentc31f1057056c95e005af348cf36c41271987465d (diff)
serial: mvf: enable FIFO even when using serial console
Enable FIFO unconditionally, even when CONFIG_SERIAL_CORE_CONSOLE is turned on. Serial consoles get enabled anyway, but this compile time switch lead to disabling FIFO for all serial ports. Not using FIFO when using a serial port might lead to missing characters quite easily.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/serial/mvf.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/serial/mvf.c b/drivers/tty/serial/mvf.c
index 36713c6c3983..ae35ffdf4907 100644
--- a/drivers/tty/serial/mvf.c
+++ b/drivers/tty/serial/mvf.c
@@ -563,6 +563,7 @@ static int imx_setup_watermark(struct imx_port *sport, unsigned int mode)
MXC_UARTPFIFO_TXFIFOSIZE_MASK) + 1);
sport->rx_fifo_size = 0x1 << (((val >> MXC_UARTPFIFO_RXFIFOSIZE_OFF) &
MXC_UARTPFIFO_RXFIFOSIZE_MASK) + 1);
+
writeb(val | MXC_UARTPFIFO_TXFE | MXC_UARTPFIFO_RXFE,
sport->port.membase + MXC_UARTPFIFO);
@@ -587,10 +588,8 @@ static int imx_startup(struct uart_port *port)
struct tty_struct *tty;
struct imxuart_platform_data *pdata = port->dev->platform_data;
-#ifndef CONFIG_SERIAL_CORE_CONSOLE
if (sport->fifo_en)
imx_setup_watermark(sport, 0);
-#endif
/*
* Allocate the IRQ(s)