diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-06-13 14:19:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-13 14:19:53 +0100 |
| commit | ed4cf49020b62fadd994dfa96f74151abb105cf4 (patch) | |
| tree | 7cc2ac4595a95e0ed79558872ca65e94bc9209a5 | |
| parent | 74a44dca29be3e780ea50cf7a595883a399e7cfb (diff) | |
| parent | 529b541e8b81f68bb6ee3c6ecdb43b5cbe0a9d70 (diff) | |
| download | platform_external_arm-trusted-firmware-ed4cf49020b62fadd994dfa96f74151abb105cf4.tar.gz platform_external_arm-trusted-firmware-ed4cf49020b62fadd994dfa96f74151abb105cf4.tar.bz2 platform_external_arm-trusted-firmware-ed4cf49020b62fadd994dfa96f74151abb105cf4.zip | |
Merge pull request #1402 from glneo/for-upstream-uart
drivers: ti: uart: Add TI specific 16550 initialization
| -rw-r--r-- | drivers/ti/uart/aarch64/16550_console.S | 4 | ||||
| -rw-r--r-- | include/drivers/ti/uart/uart_16550.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ti/uart/aarch64/16550_console.S b/drivers/ti/uart/aarch64/16550_console.S index 56e7e5c11..d46fa6119 100644 --- a/drivers/ti/uart/aarch64/16550_console.S +++ b/drivers/ti/uart/aarch64/16550_console.S @@ -66,6 +66,10 @@ func console_16550_core_init /* no interrupt */ mov w3, #0 str w3, [x0, #UARTIER] +#ifdef TI_16550_MDR_QUIRK + /* UART must be enabled on some platforms via the MDR register */ + str w3, [x0, #UARTMDR1] +#endif /* TI_16550_MDR_QUIRK */ /* enable fifo, DMA */ mov w3, #(UARTFCR_FIFOEN | UARTFCR_DMAEN) str w3, [x0, #UARTFCR] diff --git a/include/drivers/ti/uart/uart_16550.h b/include/drivers/ti/uart/uart_16550.h index 9eba41aa6..b00f66421 100644 --- a/include/drivers/ti/uart/uart_16550.h +++ b/include/drivers/ti/uart/uart_16550.h @@ -23,6 +23,8 @@ #define UARTMSR 0x18 #define UARTSPR 0x1c #define UARTCSR 0x20 +/* Some instances have MDR1 defined as well */ +#define UARTMDR1 0x20 #define UARTRXFIFOCFG 0x24 #define UARTMIE 0x28 #define UARTVNDR 0x2c |