serial: lpuart: restructure lpuart driver

[oweals/u-boot.git] / drivers / serial / serial_ns16550.c

diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index dafeed742df49e7d56bf2774314ea535c228be22..fcb1e95e81002ab49244d4bf5f3482afe407cd81 100644 (file)
--- 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,16 +119,7 @@ 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)
+static void _serial_putc(const char c, const int port)
 {
        if (c == '\n')
                NS16550_putc(PORT, '\r');
@@ -135,39 +127,29 @@ _serial_putc(const char c,const int port)
        NS16550_putc(PORT, c);
 }
 
-void
-_serial_putc_raw(const char c,const int port)
-{
-       NS16550_putc(PORT, c);
-}
-
-void
-_serial_puts (const char *s,const int port)
+static void _serial_puts(const char *s, const int port)
 {
        while (*s) {
-               _serial_putc (*s++,port);
+               _serial_putc(*s++, port);
        }
 }
 
-
-int
-_serial_getc(const int port)
+static int _serial_getc(const int port)
 {
        return NS16550_getc(PORT);
 }
 
-int
-_serial_tstc(const int port)
+static int _serial_tstc(const int port)
 {
        return NS16550_tstc(PORT);
 }
 
-void
-_serial_setbrg (const int port)
+static void _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);
 }
 
@@ -177,12 +159,6 @@ serial_putc_dev(unsigned int dev_index,const char c)
        _serial_putc(c,dev_index);
 }
 
-static inline void
-serial_putc_raw_dev(unsigned int dev_index,const char c)
-{
-       _serial_putc_raw(c,dev_index);
-}
-
 static inline void
 serial_puts_dev(unsigned int dev_index,const char *s)
 {