|
@@ -1433,10 +1433,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
|
|
|
|
|
|
memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring));
|
|
|
|
|
|
- if (pdata->regs)
|
|
|
+ if (pdata->regs) {
|
|
|
/* Already mapped by setup code */
|
|
|
port->membase = pdata->regs;
|
|
|
- else {
|
|
|
+ } else {
|
|
|
port->flags |= UPF_IOREMAP;
|
|
|
port->membase = NULL;
|
|
|
}
|
|
@@ -1450,9 +1450,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
|
|
|
/* only enable clock when USART is in use */
|
|
|
}
|
|
|
|
|
|
- atmel_port->use_dma_rx = pdata->use_dma_rx;
|
|
|
- atmel_port->use_dma_tx = pdata->use_dma_tx;
|
|
|
+ atmel_port->use_dma_rx = pdata->use_dma_rx;
|
|
|
+ atmel_port->use_dma_tx = pdata->use_dma_tx;
|
|
|
atmel_port->rs485 = pdata->rs485;
|
|
|
+
|
|
|
/* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */
|
|
|
if (atmel_port->rs485.flags & SER_RS485_ENABLED)
|
|
|
atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;
|