Commit 1c06bde6 authored by Martyn Welch's avatar Martyn Welch Committed by Greg Kroah-Hartman
Browse files

Allowing UART DMA to be configured on i.MX53 



The UART DMA was only being configured on i.MX6Q compatible devices. We
know that the DMA also works for i.MX53 devices, so enable uart DMA for
imx53 and let the device tree to configure if DMA should be used or not.

Signed-off-by: default avatarMartyn Welch <martyn.welch@collabora.co.uk>
Signed-off-by: default avatarFabien Lahoudere <fabien.lahoudere@collabora.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 31d054dc

drivers/tty/serial/imx.c

+15 −2
Original line number Diff line number Diff line
@@ -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,
@@ -260,6 +265,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE