Merge branch 'agust@denx.de-next' of git://git.denx.de/u-boot-staging

[u-boot] / board / esd / cpci750 / serial.c

diff --git a/board/esd/cpci750/serial.c b/board/esd/cpci750/serial.c
index ba32ac12acedd54ee1b329a5592e55d361a4e5de..25f8950e9adc7f5e84fd62fb003d122e469ad476 100644 (file)
--- a/board/esd/cpci750/serial.c
+++ b/board/esd/cpci750/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 cpci750_serial_init(void)
 {
        mpsc_init (gd->baudrate);
 
        return (0);
 }
 
-void serial_putc (const char c)
+static void cpci750_serial_putc(const char c)
 {
        if (c == '\n')
                mpsc_putchar ('\r');
@@ -57,30 +60,51 @@ void serial_putc (const char c)
        mpsc_putchar (c);
 }
 
-int serial_getc (void)
+static int cpci750_serial_getc(void)
 {
        return mpsc_getchar ();
 }
 
-int serial_tstc (void)
+static int cpci750_serial_tstc(void)
 {
        return mpsc_test_char ();
 }
 
-void serial_setbrg (void)
+static void cpci750_serial_setbrg(void)
 {
        galbrg_set_baudrate (CONFIG_MPSC_PORT, gd->baudrate);
 }
 
 
-void serial_puts (const char *s)
+static void cpci750_serial_puts(const char *s)
 {
        while (*s) {
                serial_putc (*s++);
        }
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+static struct serial_device cpci750_serial_drv = {
+       .name   = "cpci750_serial",
+       .start  = cpci750_serial_init,
+       .stop   = NULL,
+       .setbrg = cpci750_serial_setbrg,
+       .putc   = cpci750_serial_putc,
+       .puts   = cpci750_serial_puts,
+       .getc   = cpci750_serial_getc,
+       .tstc   = cpci750_serial_tstc,
+};
+
+void cpci750_serial_initialize(void)
+{
+       serial_register(&cpci750_serial_drv);
+}
+
+__weak struct serial_device *default_serial_console(void)
+{
+       return &cpci750_serial_drv;
+}
+
+#if defined(CONFIG_CMD_KGDB)
 void kgdb_serial_init (void)
 {
 }
@@ -104,4 +128,4 @@ void kgdb_interruptible (int yes)
 {
        return;
 }
-#endif /* CFG_CMD_KGDB */
+#endif