Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / board / esd / cpci750 / serial.c

diff --git a/board/esd/cpci750/serial.c b/board/esd/cpci750/serial.c
index ba32ac12acedd54ee1b329a5592e55d361a4e5de..6c2cf215acfa92970179f10f1e1c4c2f463783b5 100644 (file)
--- a/board/esd/cpci750/serial.c
+++ b/board/esd/cpci750/serial.c
@@ -8,23 +8,7 @@
  * modified for cpci750 board by
  * Reinhard Arlt <reinhard.arlt@esd-electronics.com>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -35,21 +19,23 @@
 
 #include <common.h>
 #include <command.h>
+#include <serial.h>
+#include <linux/compiler.h>
+
 #include "../../Marvell/include/memory.h"
-#include "serial.h"
 
 #include "mpsc.h"
 
 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 +43,43 @@ 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);
 }
 
+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   = default_serial_puts,
+       .getc   = cpci750_serial_getc,
+       .tstc   = cpci750_serial_tstc,
+};
+
+void cpci750_serial_initialize(void)
+{
+       serial_register(&cpci750_serial_drv);
+}
 
-void serial_puts (const char *s)
+__weak struct serial_device *default_serial_console(void)
 {
-       while (*s) {
-               serial_putc (*s++);
-       }
+       return &cpci750_serial_drv;
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 void kgdb_serial_init (void)
 {
 }
@@ -104,4 +103,4 @@ void kgdb_interruptible (int yes)
 {
        return;
 }
-#endif /* CFG_CMD_KGDB */
+#endif