Merge remote-tracking branch 'u-boot-ti/master'

[karo-tx-uboot.git] / board / Marvell / common / serial.c

diff --git a/board/Marvell/common/serial.c b/board/Marvell/common/serial.c
index 6a1d4d7f5c7632498d013ba92158bce9c4f2f1c3..4a780c3746bd591cd6de6a2bf12d59e5de4d154a 100644 (file)
--- a/board/Marvell/common/serial.c
+++ b/board/Marvell/common/serial.c
@@ -32,6 +32,9 @@
 
 #include <common.h>
 #include <command.h>
+#include <serial.h>
+#include <linux/compiler.h>
+
 #include "../include/memory.h"
 #include "serial.h"
 
@@ -48,27 +51,25 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_MPSC
-
-
-int serial_init (void)
+static int marvell_serial_init(void)
 {
-#if (defined CFG_INIT_CHAN1) || (defined CFG_INIT_CHAN2)
+#if (defined CONFIG_SYS_INIT_CHAN1) || (defined CONFIG_SYS_INIT_CHAN2)
        int clock_divisor = 230400 / gd->baudrate;
 #endif
 
        mpsc_init (gd->baudrate);
 
        /* init the DUART chans so that KGDB in the kernel can use them */
-#ifdef CFG_INIT_CHAN1
+#ifdef CONFIG_SYS_INIT_CHAN1
        NS16550_reinit (COM_PORTS[0], clock_divisor);
 #endif
-#ifdef CFG_INIT_CHAN2
+#ifdef CONFIG_SYS_INIT_CHAN2
        NS16550_reinit (COM_PORTS[1], clock_divisor);
 #endif
        return (0);
 }
 
-void serial_putc (const char c)
+static void marvell_serial_putc(const char c)
 {
        if (c == '\n')
                mpsc_putchar ('\r');
@@ -76,76 +77,90 @@ void serial_putc (const char c)
        mpsc_putchar (c);
 }
 
-int serial_getc (void)
+static int marvell_serial_getc(void)
 {
        return mpsc_getchar ();
 }
 
-int serial_tstc (void)
+static int marvell_serial_tstc(void)
 {
        return mpsc_test_char ();
 }
 
-void serial_setbrg (void)
+static void marvell_serial_setbrg(void)
 {
        galbrg_set_baudrate (CONFIG_MPSC_PORT, gd->baudrate);
 }
 
 #else  /* ! CONFIG_MPSC */
 
-int serial_init (void)
+static int marvell_serial_init(void)
 {
        int clock_divisor = 230400 / gd->baudrate;
 
-#ifdef CFG_INIT_CHAN1
+#ifdef CONFIG_SYS_INIT_CHAN1
        (void) NS16550_init (0, clock_divisor);
 #endif
-#ifdef CFG_INIT_CHAN2
+#ifdef CONFIG_SYS_INIT_CHAN2
        (void) NS16550_init (1, clock_divisor);
 #endif
        return (0);
 }
 
-void serial_putc (const char c)
+static void marvell_serial_putc(const char c)
 {
        if (c == '\n')
-               NS16550_putc (COM_PORTS[CFG_DUART_CHAN], '\r');
+               NS16550_putc (COM_PORTS[CONFIG_SYS_DUART_CHAN], '\r');
 
-       NS16550_putc (COM_PORTS[CFG_DUART_CHAN], c);
+       NS16550_putc (COM_PORTS[CONFIG_SYS_DUART_CHAN], c);
 }
 
-int serial_getc (void)
+static int marvell_serial_getc(void)
 {
-       return NS16550_getc (COM_PORTS[CFG_DUART_CHAN]);
+       return NS16550_getc (COM_PORTS[CONFIG_SYS_DUART_CHAN]);
 }
 
-int serial_tstc (void)
+static int marvell_serial_tstc(void)
 {
-       return NS16550_tstc (COM_PORTS[CFG_DUART_CHAN]);
+       return NS16550_tstc (COM_PORTS[CONFIG_SYS_DUART_CHAN]);
 }
 
-void serial_setbrg (void)
+static void marvell_serial_setbrg(void)
 {
        int clock_divisor = 230400 / gd->baudrate;
 
-#ifdef CFG_INIT_CHAN1
+#ifdef CONFIG_SYS_INIT_CHAN1
        NS16550_reinit (COM_PORTS[0], clock_divisor);
 #endif
-#ifdef CFG_INIT_CHAN2
+#ifdef CONFIG_SYS_INIT_CHAN2
        NS16550_reinit (COM_PORTS[1], clock_divisor);
 #endif
 }
 
 #endif /* CONFIG_MPSC */
 
-void serial_puts (const char *s)
+static struct serial_device marvell_serial_drv = {
+       .name   = "marvell_serial",
+       .start  = marvell_serial_init,
+       .stop   = NULL,
+       .setbrg = marvell_serial_setbrg,
+       .putc   = marvell_serial_putc,
+       .puts   = default_serial_puts,
+       .getc   = marvell_serial_getc,
+       .tstc   = marvell_serial_tstc,
+};
+
+void marvell_serial_initialize(void)
 {
-       while (*s) {
-               serial_putc (*s++);
-       }
+       serial_register(&marvell_serial_drv);
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+__weak struct serial_device *default_serial_console(void)
+{
+       return &marvell_serial_drv;
+}
+
+#if defined(CONFIG_CMD_KGDB)
 void kgdb_serial_init (void)
 {
 }
@@ -169,4 +184,4 @@ void kgdb_interruptible (int yes)
 {
        return;
 }
-#endif /* CFG_CMD_KGDB */
+#endif