Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1457665

[PATCH 1/2] Allowing UART DMA to be configured on i.MX53

Show all headers | View raw

From: Martyn Welch <martyn.welch@collabora.co.uk>

The UART DMA was only being configured on i.MX6Q compatible devices. We
know that the DMA also works for i.MX53 devices, so allow DMA to be
configured on those devices too.

Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
---
 drivers/tty/serial/imx.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 08ccfe1..1c9315a 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -190,6 +190,7 @@
 enum imx_uart_type {
 	IMX1_UART,
 	IMX21_UART,
+	IMX53_UART,
 	IMX6Q_UART,
 };
 
@@ -247,6 +248,10 @@ static struct imx_uart_data imx_uart_devdata[] = {
 		.uts_reg = IMX21_UTS,
 		.devtype = IMX21_UART,
 	},
+	[IMX53_UART] = {
+		.uts_reg = IMX21_UTS,
+		.devtype = IMX53_UART,
+	},
 	[IMX6Q_UART] = {
 		.uts_reg = IMX21_UTS,
 		.devtype = IMX6Q_UART,
@@ -261,6 +266,9 @@ static const struct platform_device_id imx_uart_devtype[] = {
 		.name = "imx21-uart",
 		.driver_data = (kernel_ulong_t) &imx_uart_devdata[IMX21_UART],
 	}, {
+		.name = "imx53-uart",
+		.driver_data = (kernel_ulong_t) &imx_uart_devdata[IMX53_UART],
+	}, {
 		.name = "imx6q-uart",
 		.driver_data = (kernel_ulong_t) &imx_uart_devdata[IMX6Q_UART],
 	}, {
@@ -271,6 +279,7 @@ MODULE_DEVICE_TABLE(platform, imx_uart_devtype);
 
 static const struct of_device_id imx_uart_dt_ids[] = {
 	{ .compatible = "fsl,imx6q-uart", .data = &imx_uart_devdata[IMX6Q_UART], },
+	{ .compatible = "fsl,imx53-uart", .data = &imx_uart_devdata[IMX53_UART], },
 	{ .compatible = "fsl,imx1-uart", .data = &imx_uart_devdata[IMX1_UART], },
 	{ .compatible = "fsl,imx21-uart", .data = &imx_uart_devdata[IMX21_UART], },
 	{ /* sentinel */ }
@@ -292,6 +301,11 @@ static inline int is_imx21_uart(struct imx_port *sport)
 	return sport->devdata->devtype == IMX21_UART;
 }
 
+static inline int is_imx53_uart(struct imx_port *sport)
+{
+	return sport->devdata->devtype == IMX53_UART;
+}
+
 static inline int is_imx6q_uart(struct imx_port *sport)
 {
 	return sport->devdata->devtype == IMX6Q_UART;
@@ -1254,8 +1268,7 @@ static int imx_startup(struct uart_port *port)
 	writel(temp & ~UCR4_DREN, sport->port.membase + UCR4);
 
 	/* Can we enable the DMA support? */
-	if (is_imx6q_uart(sport) && !uart_console(port) &&
-	    !sport->dma_is_inited)
+	if (!uart_console(port) && !sport->dma_is_inited)
 		imx_uart_dma_init(sport);
 
 	spin_lock_irqsave(&sport->port.lock, flags);
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH 2/2] imx53.dtsi : Add DMA configuration for UART Fabio Estevam <festevam@gmail.com> - 2016-08-03 16:30 +0200
  [PATCH v2 2/2] imx53.dtsi : Add DMA configuration for UART Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> - 2016-08-04 12:30 +0200
    Re: [PATCH v2 2/2] imx53.dtsi : Add DMA configuration for UART Alexander Shiyan <shc_work@mail.ru> - 2016-08-04 13:30 +0200
      Re: [PATCH v2 2/2] imx53.dtsi : Add DMA configuration for UART Fabio Estevam <festevam@gmail.com> - 2016-08-06 22:10 +0200
        [PATCH 2/2] imx53.dtsi : Add DMA configuration for UART Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> - 2016-08-08 11:30 +0200
        [PATCH 1/2] Allowing UART DMA to be configured on i.MX53 Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> - 2016-08-08 11:40 +0200
    Re: [PATCH v2 2/2] imx53.dtsi : Add DMA configuration for UART Shawn Guo <shawnguo@kernel.org> - 2016-08-09 15:40 +0200
  [PATCH v2 1/2] Allowing UART DMA to be configured on i.MX53 Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> - 2016-08-04 12:40 +0200
  [PATCH 1/1] imx53.dtsi: Add IPU nodes for csi Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> - 2016-08-04 16:00 +0200
    Re: [PATCH 1/1] imx53.dtsi: Add IPU nodes for csi Philipp Zabel <p.zabel@pengutronix.de> - 2016-08-05 11:40 +0200
    Re: [PATCH 1/1] imx53.dtsi: Add IPU nodes for csi Shawn Guo <shawnguo@kernel.org> - 2016-08-09 15:40 +0200

csiph-web