diff options
author | Tom Rini <trini@ti.com> | 2014-09-13 20:32:52 (GMT) |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-09-13 20:32:52 (GMT) |
commit | 8d028d404fa117a4b1f425d7cfc8affe1d8df6d5 (patch) | |
tree | 39cad1c0da41fd8e45a29a4dba23289cbd411773 /drivers/serial/serial_ns16550.c | |
parent | 114cc4290b2f24bb314edf2edd5d8738a0778c4b (diff) | |
parent | 858530a8c0a7ce7e573e513934804a00d6676813 (diff) | |
download | u-boot-8d028d404fa117a4b1f425d7cfc8affe1d8df6d5.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/serial/serial_ns16550.c')
-rw-r--r-- | drivers/serial/serial_ns16550.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index dafeed7..632da4c 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -81,7 +81,8 @@ static NS16550_t serial_ports[6] = { static int eserial##port##_init(void) \ { \ int clock_divisor; \ - clock_divisor = calc_divisor(serial_ports[port-1]); \ + clock_divisor = ns16550_calc_divisor(serial_ports[port-1], \ + CONFIG_SYS_NS16550_CLK, gd->baudrate); \ NS16550_init(serial_ports[port-1], clock_divisor); \ return 0 ; \ } \ @@ -118,14 +119,6 @@ static NS16550_t serial_ports[6] = { .puts = eserial##port##_puts, \ } -static int calc_divisor (NS16550_t port) -{ - const unsigned int mode_x_div = 16; - - return DIV_ROUND_CLOSEST(CONFIG_SYS_NS16550_CLK, - mode_x_div * gd->baudrate); -} - void _serial_putc(const char c,const int port) { @@ -167,7 +160,8 @@ _serial_setbrg (const int port) { int clock_divisor; - clock_divisor = calc_divisor(PORT); + clock_divisor = ns16550_calc_divisor(PORT, CONFIG_SYS_NS16550_CLK, + gd->baudrate); NS16550_reinit(PORT, clock_divisor); } |