linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: marex@denx.de (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] serial: imx: Only enable UART DMA on i.MX6Q and i.MX53
Date: Sat,  4 Feb 2017 22:39:31 +0100	[thread overview]
Message-ID: <20170204213931.3566-1-marex@denx.de> (raw)

From: Kai Ruhnau <kai.ruhnau@target-sg.com>

In 1c06bde6 with the introduction of DMA support for the i.MX53 platform,
DMA was enabled for all platforms instead. On an i.MX6SX (which is a
IMX21_UART), this breaks gpsd talking to an UART module with

 imx-uart 21f4000.serial: DMA transaction error.

This patch makes sure, UART DMA is only activated for i.MX53 and i.MX6Q.

Signed-off-by: Kai Ruhnau <kai.ruhnau@target-sg.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Fixes: 1c06bde643d0 ("Allowing UART DMA to be configured on i.MX53")
Cc: <stable@vger.kernel.org> # 4.9+
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Martyn Welch <martyn.welch@collabora.co.uk>
Cc: Shawn Guo <shawnguo@kernel.org>
---
 drivers/tty/serial/imx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index a70356d..8e2b5f2 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1269,7 +1269,8 @@ static int imx_startup(struct uart_port *port)
 	writel(temp & ~UCR4_DREN, sport->port.membase + UCR4);
 
 	/* Can we enable the DMA support? */
-	if (!uart_console(port) && !sport->dma_is_inited)
+	if ((is_imx6q_uart(sport)  || is_imx53_uart(sport)) &&
+	    !uart_console(port) && !sport->dma_is_inited)
 		imx_uart_dma_init(sport);
 
 	spin_lock_irqsave(&sport->port.lock, flags);
-- 
2.10.2

             reply	other threads:[~2017-02-04 21:39 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-04 21:39 Marek Vasut [this message]
     [not found] ` <DB6PR0402MB2743C709F162BDE52429DF49E3410@DB6PR0402MB2743.eurprd04.prod.outlook.com>
2017-02-05 16:36   ` [PATCH] serial: imx: Only enable UART DMA on i.MX6Q and i.MX53 Fabio Estevam
2017-02-05 17:51     ` Clemens Gruber
2017-02-06 19:24       ` Marek Vasut
2017-02-06 19:05     ` Marek Vasut
2017-02-06 19:38       ` Fabio Estevam
2017-02-06 19:43         ` Marek Vasut
2017-02-06 23:39           ` Fabio Estevam

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170204213931.3566-1-marex@denx.de \
    --to=marex@denx.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).