summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2017-10-20 23:20:19 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-04 12:38:49 +0100
commit52108109fa125ffb11df178e1ac5eb9650f0743d (patch)
treed02c11327ea7130bd8a21fe5703bf1be7e86d85b /drivers/tty
parentserial: 8250: fix potential deadlock in rs485-mode (diff)
downloadlinux-52108109fa125ffb11df178e1ac5eb9650f0743d.tar.xz
linux-52108109fa125ffb11df178e1ac5eb9650f0743d.zip
tty: serial: imx: disable ageing timer interrupt if dma in use
Since commit 4dec2f119e86 ("imx-serial: RX DMA startup latency") the interrupt routine no longer will start rx dma. So, we no longer need to enable this interrupt to start dma. Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> 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, 0 insertions, 4 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 2d042c60d2fa..bf3e981e26a2 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1208,10 +1208,6 @@ static void imx_enable_dma(struct imx_port *sport)
temp |= UCR1_RDMAEN | UCR1_TDMAEN | UCR1_ATDMAEN;
writel(temp, sport->port.membase + UCR1);
- temp = readl(sport->port.membase + UCR2);
- temp |= UCR2_ATEN;
- writel(temp, sport->port.membase + UCR2);
-
imx_setup_ufcr(sport, TXTL_DMA, RXTL_DMA);
sport->dma_is_enabled = 1;