Commit 89fa28db authored by Chanho Min's avatar Chanho Min Committed by Greg Kroah-Hartman

amba-pl011: fix build error if CONFIG_DMA_ENGINE is not enabled

Following patch will fix build error if CONFIG_DMA_ENGINE is unset.
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarChanho Min <chanho.min@lge.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ef99f3ae
...@@ -1195,6 +1195,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap) ...@@ -1195,6 +1195,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap)
uap->im |= UART011_RXIM; uap->im |= UART011_RXIM;
} else { } else {
uap->im &= ~UART011_RXIM; uap->im &= ~UART011_RXIM;
#ifdef CONFIG_DMA_ENGINE
/* Start Rx DMA poll */ /* Start Rx DMA poll */
if (uap->dmarx.poll_rate) { if (uap->dmarx.poll_rate) {
uap->dmarx.last_jiffies = jiffies; uap->dmarx.last_jiffies = jiffies;
...@@ -1203,6 +1204,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap) ...@@ -1203,6 +1204,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap)
jiffies + jiffies +
msecs_to_jiffies(uap->dmarx.poll_rate)); msecs_to_jiffies(uap->dmarx.poll_rate));
} }
#endif
} }
writew(uap->im, uap->port.membase + UART011_IMSC); writew(uap->im, uap->port.membase + UART011_IMSC);
...@@ -1665,11 +1667,13 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -1665,11 +1667,13 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
*/ */
baud = uart_get_baud_rate(port, termios, old, 0, baud = uart_get_baud_rate(port, termios, old, 0,
port->uartclk / clkdiv); port->uartclk / clkdiv);
#ifdef CONFIG_DMA_ENGINE
/* /*
* Adjust RX DMA polling rate with baud rate if not specified. * Adjust RX DMA polling rate with baud rate if not specified.
*/ */
if (uap->dmarx.auto_poll_rate) if (uap->dmarx.auto_poll_rate)
uap->dmarx.poll_rate = DIV_ROUND_UP(10000000, baud); uap->dmarx.poll_rate = DIV_ROUND_UP(10000000, baud);
#endif
if (baud > port->uartclk/16) if (baud > port->uartclk/16)
quot = DIV_ROUND_CLOSEST(port->uartclk * 8, baud); quot = DIV_ROUND_CLOSEST(port->uartclk * 8, baud);
......
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