An earlier patch "serial: pl011: use DMA RX polling by default" enabled
DMA Rx polling on PL011 only in configurations, using platform data. A
simple extension of that patch also enables DMA Rx polling when no
platform data is used, e.g. in Device Tree configurations. In such cases
a default poll timeout and an automatically calculated poll rate will be
used.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
---
drivers/tty/serial/amba-pl011.c | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index e593f8d..baecdfa 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -327,28 +327,25 @@ static void pl011_dma_probe_initcall(struct device *dev, struct uart_amba_port *
dmaengine_slave_config(chan, &rx_conf);
uap->dmarx.chan = chan;
- if (plat) {
- /* Set poll rate if specified. */
- if (plat->dma_rx_poll_rate) {
- uap->dmarx.auto_poll_rate = false;
- uap->dmarx.poll_rate = plat->dma_rx_poll_rate;
- } else {
- /*
- * 100 ms defaults to poll rate if not
- * specified. This will be adjusted with
- * the baud rate at set_termios.
- */
- uap->dmarx.auto_poll_rate = true;
- uap->dmarx.poll_rate = 100;
- }
- /* 3 secs defaults poll_timeout if not specified. */
- if (plat->dma_rx_poll_timeout)
- uap->dmarx.poll_timeout =
- plat->dma_rx_poll_timeout;
- else
- uap->dmarx.poll_timeout = 3000;
- } else
+ /* Set poll rate if specified. */
+ if (plat && plat->dma_rx_poll_rate) {
uap->dmarx.auto_poll_rate = false;
+ uap->dmarx.poll_rate = plat->dma_rx_poll_rate;
+ } else {
+ /*
+ * 100 ms defaults to poll rate if not
+ * specified. This will be adjusted with
+ * the baud rate at set_termios.
+ */
+ uap->dmarx.auto_poll_rate = true;
+ uap->dmarx.poll_rate = 100;
+ }
+ /* 3 secs defaults poll_timeout if not specified. */
+ if (plat && plat->dma_rx_poll_timeout)
+ uap->dmarx.poll_timeout =
+ plat->dma_rx_poll_timeout;
+ else
+ uap->dmarx.poll_timeout = 3000;
dev_info(uap->port.dev, "DMA channel RX %s\n",
dma_chan_name(uap->dmarx.chan));
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
