Skip to content

Commit

Permalink
amba-pl011: fix build error if CONFIG_DMA_ENGINE is not enabled
Browse files Browse the repository at this point in the history
Following patch will fix build error if CONFIG_DMA_ENGINE is unset.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Chanho Min <chanho.min@lge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Chanho Min authored and Greg Kroah-Hartman committed Apr 3, 2013
1 parent ef99f3a commit 89fa28d
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/tty/serial/amba-pl011.c
Original file line number Diff line number Diff line change
Expand Up @@ -1195,6 +1195,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap)
uap->im |= UART011_RXIM;
} else {
uap->im &= ~UART011_RXIM;
#ifdef CONFIG_DMA_ENGINE
/* Start Rx DMA poll */
if (uap->dmarx.poll_rate) {
uap->dmarx.last_jiffies = jiffies;
Expand All @@ -1203,6 +1204,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap)
jiffies +
msecs_to_jiffies(uap->dmarx.poll_rate));
}
#endif
}

writew(uap->im, uap->port.membase + UART011_IMSC);
Expand Down Expand Up @@ -1665,11 +1667,13 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
*/
baud = uart_get_baud_rate(port, termios, old, 0,
port->uartclk / clkdiv);
#ifdef CONFIG_DMA_ENGINE
/*
* Adjust RX DMA polling rate with baud rate if not specified.
*/
if (uap->dmarx.auto_poll_rate)
uap->dmarx.poll_rate = DIV_ROUND_UP(10000000, baud);
#endif

if (baud > port->uartclk/16)
quot = DIV_ROUND_CLOSEST(port->uartclk * 8, baud);
Expand Down

0 comments on commit 89fa28d

Please sign in to comment.