summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2018-03-02 11:07:24 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-09 19:21:01 +0100
commit02b0abd3bb93ea1d9818c5c5b1fcf293f81cee37 (patch)
treeeacf384beb892eb259b68a506db59587483eb378 /drivers/tty
parentserial: imx: use u32 variables with matching names for registers (diff)
downloadlinux-02b0abd3bb93ea1d9818c5c5b1fcf293f81cee37.tar.xz
linux-02b0abd3bb93ea1d9818c5c5b1fcf293f81cee37.zip
serial: imx: setup fifo waterlevel before enabling aging timer
The aging timer fires if there are characters in the RX fifo but the water level isn't reached yet. Make sure that the waterlevel is configured before the aging timer is enabled to trigger a DMA request (UCR1_ATDMAEN). Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/imx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 23d591897e82..9b92c49fc174 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1239,13 +1239,13 @@ static void imx_enable_dma(struct imx_port *sport)
{
u32 ucr1;
+ imx_setup_ufcr(sport, TXTL_DMA, RXTL_DMA);
+
/* set UCR1 */
ucr1 = imx_uart_readl(sport, UCR1);
ucr1 |= UCR1_RXDMAEN | UCR1_TXDMAEN | UCR1_ATDMAEN;
imx_uart_writel(sport, ucr1, UCR1);
- imx_setup_ufcr(sport, TXTL_DMA, RXTL_DMA);
-
sport->dma_is_enabled = 1;
}