Merge git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / board / prodrive / p3mx / serial.c

diff --git a/board/prodrive/p3mx/serial.c b/board/prodrive/p3mx/serial.c
index ba32ac1..3536933 100644 (file)
--- a/board/prodrive/p3mx/serial.c
+++ b/board/prodrive/p3mx/serial.c
@@ -35,6 +35,9 @@
 
 #include <common.h>
 #include <command.h>
+#include <serial.h>
+#include <linux/compiler.h>
+
 #include "../../Marvell/include/memory.h"
 #include "serial.h"
 
@@ -42,14 +45,14 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int serial_init (void)
+static int p3mx_serial_init(void)
 {
        mpsc_init (gd->baudrate);
 
        return (0);
 }
 
-void serial_putc (const char c)
+static void p3mx_serial_putc(const char c)
 {
        if (c == '\n')
                mpsc_putchar ('\r');
@@ -57,30 +60,43 @@ void serial_putc (const char c)
        mpsc_putchar (c);
 }
 
-int serial_getc (void)
+static int p3mx_serial_getc(void)
 {
        return mpsc_getchar ();
 }
 
-int serial_tstc (void)
+static int p3mx_serial_tstc(void)
 {
        return mpsc_test_char ();
 }
 
-void serial_setbrg (void)
+static void p3mx_serial_setbrg(void)
 {
        galbrg_set_baudrate (CONFIG_MPSC_PORT, gd->baudrate);
 }
 
+static struct serial_device p3mx_serial_drv = {
+       .name   = "p3mx_serial",
+       .start  = p3mx_serial_init,
+       .stop   = NULL,
+       .setbrg = p3mx_serial_setbrg,
+       .putc   = p3mx_serial_putc,
+       .puts   = default_serial_puts,
+       .getc   = p3mx_serial_getc,
+       .tstc   = p3mx_serial_tstc,
+};
+
+void p3mx_serial_initialize(void)
+{
+       serial_register(&p3mx_serial_drv);
+}
 
-void serial_puts (const char *s)
+__weak struct serial_device *default_serial_console(void)
 {
-       while (*s) {
-               serial_putc (*s++);
-       }
+       return &p3mx_serial_drv;
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 void kgdb_serial_init (void)
 {
 }
@@ -104,4 +120,4 @@ void kgdb_interruptible (int yes)
 {
        return;
 }
-#endif /* CFG_CMD_KGDB */
+#endif