Commit 8418e67d authored by Huang Shijie's avatar Huang Shijie Committed by Greg Kroah-Hartman

serial: mxs: enable the DMA only when the RTS/CTS is valid

The original DMA support works only when RTS/CTS is enabled.
(see the "e8001632 serial: mxs-auart: add the DMA support for mx28")
But after several patches, DMA support has lost this limit.
(see the "bcc20f9e serial: mxs-auart: move to use generic DMA helper")

So an UART without the RTS/CTS lines may also enables the DMA support,
in which case the UART may gets unpredictable results.

This patch adds an optional property for the UART DT node
which indicates the UART has RTS and CTS lines, and it also means you
enable the DMA support for this UART.

This patch also adds a macro MXS_AUART_RTSCTS, and uses it to check
RTS/CTS before we enable the DMA for the UART.
Signed-off-by: default avatarHuang Shijie <b32955@freescale.com>
Signed-off-by: default avatarHuang Shijie <shijie8@gmail.com>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ac1ccb7
...@@ -10,6 +10,10 @@ Required properties: ...@@ -10,6 +10,10 @@ Required properties:
Refer to dma.txt and fsl-mxs-dma.txt for details. Refer to dma.txt and fsl-mxs-dma.txt for details.
- dma-names: "rx" for RX channel, "tx" for TX channel. - dma-names: "rx" for RX channel, "tx" for TX channel.
Optional properties:
- fsl,uart-has-rtscts : Indicate the UART has RTS and CTS lines,
it also means you enable the DMA support for this UART.
Example: Example:
auart0: serial@8006a000 { auart0: serial@8006a000 {
compatible = "fsl,imx28-auart", "fsl,imx23-auart"; compatible = "fsl,imx28-auart", "fsl,imx23-auart";
......
...@@ -137,6 +137,7 @@ struct mxs_auart_port { ...@@ -137,6 +137,7 @@ struct mxs_auart_port {
#define MXS_AUART_DMA_ENABLED 0x2 #define MXS_AUART_DMA_ENABLED 0x2
#define MXS_AUART_DMA_TX_SYNC 2 /* bit 2 */ #define MXS_AUART_DMA_TX_SYNC 2 /* bit 2 */
#define MXS_AUART_DMA_RX_READY 3 /* bit 3 */ #define MXS_AUART_DMA_RX_READY 3 /* bit 3 */
#define MXS_AUART_RTSCTS 4 /* bit 4 */
unsigned long flags; unsigned long flags;
unsigned int ctrl; unsigned int ctrl;
enum mxs_auart_type devtype; enum mxs_auart_type devtype;
...@@ -639,7 +640,8 @@ static void mxs_auart_settermios(struct uart_port *u, ...@@ -639,7 +640,8 @@ static void mxs_auart_settermios(struct uart_port *u,
* we can only implement the DMA support for auart * we can only implement the DMA support for auart
* in mx28. * in mx28.
*/ */
if (is_imx28_auart(s) && (s->flags & MXS_AUART_DMA_CONFIG)) { if (is_imx28_auart(s) && (s->flags & MXS_AUART_DMA_CONFIG)
&& test_bit(MXS_AUART_RTSCTS, &s->flags)) {
if (!mxs_auart_dma_init(s)) if (!mxs_auart_dma_init(s))
/* enable DMA tranfer */ /* enable DMA tranfer */
ctrl2 |= AUART_CTRL2_TXDMAE | AUART_CTRL2_RXDMAE ctrl2 |= AUART_CTRL2_TXDMAE | AUART_CTRL2_RXDMAE
...@@ -1009,6 +1011,9 @@ static int serial_mxs_probe_dt(struct mxs_auart_port *s, ...@@ -1009,6 +1011,9 @@ static int serial_mxs_probe_dt(struct mxs_auart_port *s,
s->flags |= MXS_AUART_DMA_CONFIG; s->flags |= MXS_AUART_DMA_CONFIG;
if (of_get_property(np, "fsl,uart-has-rtscts", NULL))
set_bit(MXS_AUART_RTSCTS, &s->flags);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment