diff options
| author | Tom Rini <[email protected]> | 2021-07-31 08:18:14 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-07-31 08:18:14 -0400 |
| commit | 85769006fce951d0ebf61585ae0ab6b7d880735d (patch) | |
| tree | 12a2b59bf6475489ce9d20ba79b65dc26286b1fa /drivers/serial | |
| parent | 15f7e0dc01d8a851fb1bfbf0e47eab5b67ed26b3 (diff) | |
| parent | 2cc4be280c259ac1e8e74c643c72e0331266056f (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- kwboot / kwbimage improvements reducing image size (Pali & Marek)
- a37xx: pinctrl: Correct PWM pins definitions (Marek)
- Convert the Dreamplug Ethernet and SATA to Driver Model (Tony)
- serial: a37xx: DEBUG_UART improvements / fixes (Pali)
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_mvebu_a3700.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/serial/serial_mvebu_a3700.c b/drivers/serial/serial_mvebu_a3700.c index c7e66fef876..6bca8e4b7e2 100644 --- a/drivers/serial/serial_mvebu_a3700.c +++ b/drivers/serial/serial_mvebu_a3700.c @@ -305,11 +305,12 @@ U_BOOT_DRIVER(serial_mvebu) = { #ifdef CONFIG_DEBUG_MVEBU_A3700_UART #include <debug_uart.h> +#include <mach/soc.h> static inline void _debug_uart_init(void) { void __iomem *base = (void __iomem *)CONFIG_DEBUG_UART_BASE; - u32 baudrate, parent_rate, divider; + u32 parent_rate, divider; /* reset FIFOs */ writel(UART_CTRL_RXFIFO_RESET | UART_CTRL_TXFIFO_RESET, @@ -322,9 +323,9 @@ static inline void _debug_uart_init(void) * Calculate divider * baudrate = clock / 16 / divider */ - baudrate = 115200; - parent_rate = get_ref_clk() * 1000000; - divider = DIV_ROUND_CLOSEST(parent_rate, baudrate * 16); + parent_rate = (readl(MVEBU_REGISTER(0x13808)) & BIT(9)) ? + 40000000 : 25000000; + divider = DIV_ROUND_CLOSEST(parent_rate, CONFIG_BAUDRATE * 16); writel(divider, base + UART_BAUD_REG); /* |