diff options
-rw-r--r-- | drivers/marvell/uart/a3700_console.S | 12 | ||||
-rw-r--r-- | include/drivers/marvell/uart/a3700_console.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/marvell/uart/a3700_console.S b/drivers/marvell/uart/a3700_console.S index 9a557aac3c..58dad7aa54 100644 --- a/drivers/marvell/uart/a3700_console.S +++ b/drivers/marvell/uart/a3700_console.S @@ -60,14 +60,14 @@ func console_a3700_core_init str w3, [x0, #UART_POSSR_REG] /* - * Wait for the TX FIFO to be empty. If wait for 20ms, the TX FIFO is + * Wait for the TX (THR and TSR) to be empty. If wait for 20ms, the TX FIFO is * still not empty, TX FIFO will reset by all means. */ mov w1, #20 /* max time out 20ms */ 2: - /* Check whether TX FIFO is empty */ + /* Check whether TX (THR and TSR) is empty */ ldr w3, [x0, #UART_STATUS_REG] - and w3, w3, #UARTLSR_TXFIFOEMPTY + and w3, w3, #UARTLSR_TXEMPTY cmp w3, #0 b.ne 4f @@ -241,10 +241,10 @@ endfunc console_a3700_getc * --------------------------------------------- */ func console_a3700_core_flush - /* Wait for the TX FIFO to be empty */ + /* Wait for the TX (THR and TSR) to be empty */ 1: ldr w1, [x0, #UART_STATUS_REG] - and w1, w1, #UARTLSR_TXFIFOEMPTY - cmp w1, #UARTLSR_TXFIFOEMPTY + and w1, w1, #UARTLSR_TXEMPTY + cmp w1, #UARTLSR_TXEMPTY b.ne 1b ret endfunc console_a3700_core_flush diff --git a/include/drivers/marvell/uart/a3700_console.h b/include/drivers/marvell/uart/a3700_console.h index e77a165608..12d2cdc523 100644 --- a/include/drivers/marvell/uart/a3700_console.h +++ b/include/drivers/marvell/uart/a3700_console.h @@ -48,12 +48,12 @@ /* Line Status Register bits */ #define UARTLSR_TXFIFOFULL (1 << 11) /* Tx Fifo Full */ +#define UARTLSR_TXEMPTY (1 << 6) /* Tx Empty */ #define UARTLSR_RXRDY (1 << 4) /* Rx Ready */ /* UART Control Register bits */ #define UART_CTRL_RXFIFO_RESET (1 << 14) #define UART_CTRL_TXFIFO_RESET (1 << 15) -#define UARTLSR_TXFIFOEMPTY (1 << 6) #ifndef __ASSEMBLER__ |