Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f898bfd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "serial: pl011: use DMA RX polling by default" 



This reverts commit 17438217 on request
of Linus Walleij:
	Greg can you please drop or revert
	commit 17438217
	"serial: pl011: use DMA RX polling by default"
	from the TTY tree until this has been sorted out?

Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d0ed182

drivers/tty/serial/amba-pl011.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ 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) {

		if (plat && plat->dma_rx_poll_enable) {

			/* Set poll rate if specified. */

			if (plat->dma_rx_poll_rate) {

				uap->dmarx.auto_poll_rate = false;

include/linux/amba/serial.h

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ struct amba_pl011_data { 
	bool (*dma_filter)(struct dma_chan *chan, void *filter_param);

	void *dma_rx_param;

	void *dma_tx_param;

	bool dma_rx_poll_enable;

	unsigned int dma_rx_poll_rate;

	unsigned int dma_rx_poll_timeout;

        void (*init) (void);