GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allwinner/a10: Fix baudrate calculation 

UART input clock is platform dependent. Also account for possible
use of get_option() where baudrate is not compile-time constant.

Change-Id: Ie1c8789ef72430e43fc33bfa9ffb9f5346762439
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5289
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2014-02-19 08:58:12 +02:00
parent c5332e30da
commit 65ba20e17b
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cpu/allwinner/a10/uart.c
View File

@ -7,6 +7,7 @@
#include "uart.h" #include "uart.h"
#include <arch/io.h> #include <arch/io.h>
#include <uart.h>
#include <uart8250.h> #include <uart8250.h>
/** /**
@ -19,11 +20,11 @@ void a10_uart_configure(void *uart_base, u32 baud_rate, u8 data_bits,
u16 div; u16 div;
struct a10_uart *uart = uart_base; struct a10_uart *uart = uart_base;
div = (u16) uart_baudrate_divisor(baud_rate,
uart_platform_refclk(), 16);
/* Enable access to Divisor Latch register */ /* Enable access to Divisor Latch register */
write32(UART_LCR_DLAB, &uart->lcr); write32(UART_LCR_DLAB, &uart->lcr);
/* Set baudrate */ /* Set baudrate */
/* FIXME: We assume clock is 24MHz, which may not be the case */
div = 24000000 / 16 / baud_rate;
write32((div >> 8) & 0xff, &uart->dlh); write32((div >> 8) & 0xff, &uart->dlh);
write32(div & 0xff, &uart->dll); write32(div & 0xff, &uart->dll);
/* Set line control */ /* Set line control */

20
src/cpu/allwinner/a10/uart_console.c
View File

@ -38,28 +38,18 @@ static void *get_console_uart_base_addr(void)
return (void *)A1X_UART0_BASE; return (void *)A1X_UART0_BASE;
} }
static u32 get_console_uart_baud(void) /* FIXME: We assume clock is 24MHz, which may not be the case. */
unsigned int uart_platform_refclk(void)
{ {
if (CONFIG_CONSOLE_SERIAL_115200) return 24000000;
return 115200;
else if (CONFIG_CONSOLE_SERIAL_57600)
return 57600;
else if (CONFIG_CONSOLE_SERIAL_38400)
return 34800;
else if (CONFIG_CONSOLE_SERIAL_19200)
return 19200;
else if (CONFIG_CONSOLE_SERIAL_9600)
return 9600;
/* Default to 115200 if selection is invalid */
return 115200;
} }
static void a10_uart_init_dev(void) static void a10_uart_init_dev(void)
{ {
void *uart_base = get_console_uart_base_addr(); void *uart_base = get_console_uart_base_addr();
/* Use default 8N1 encoding */ /* Use default 8N1 encoding */
a10_uart_configure(uart_base, get_console_uart_baud(), a10_uart_configure(uart_base, default_baudrate(),
8, UART_PARITY_NONE, 1); 8, UART_PARITY_NONE, 1);
a10_uart_enable_fifos(uart_base); a10_uart_enable_fifos(uart_base);
} }