From 02b0abd3bb93ea1d9818c5c5b1fcf293f81cee37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Fri, 2 Mar 2018 11:07:24 +0100 Subject: serial: imx: setup fifo waterlevel before enabling aging timer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/tty') 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; } -- cgit v1.2.3