Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / drivers / serial / altera_uart.c

diff --git a/drivers/serial/altera_uart.c b/drivers/serial/altera_uart.c
index 045f1197a344476c4a80bb1bef29d3c43b6cdc29..d620528e3e7ead1a6f67a6584e9d40329445eb34 100644 (file)
--- a/drivers/serial/altera_uart.c
+++ b/drivers/serial/altera_uart.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2004, Psyent Corporation <www.psyent.com>
  * Scott McNutt <smcnutt@psyent.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+
  */
 
 
@@ -26,6 +10,8 @@
 #include <watchdog.h>
 #include <asm/io.h>
 #include <nios2-io.h>
+#include <linux/compiler.h>
+#include <serial.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -37,27 +23,33 @@ static nios_uart_t *uart = (nios_uart_t *) CONFIG_SYS_NIOS_CONSOLE;
 
 #if defined(CONFIG_SYS_NIOS_FIXEDBAUD)
 
-/* Everything's already setup for fixed-baud PTF
+/*
+ * Everything's already setup for fixed-baud PTF
  * assignment
  */
-void serial_setbrg (void){ return; }
-int serial_init (void) { return (0);}
+static void altera_serial_setbrg(void)
+{
+}
+
+static int altera_serial_init(void)
+{
+       return 0;
+}
 
 #else
 
-void serial_setbrg (void)
+static void altera_serial_setbrg(void)
 {
        unsigned div;
 
        div = (CONFIG_SYS_CLK_FREQ/gd->baudrate)-1;
        writel (div, &uart->divisor);
-       return;
 }
 
-int serial_init (void)
+static int altera_serial_init(void)
 {
-       serial_setbrg ();
-       return (0);
+       serial_setbrg();
+       return 0;
 }
 
 #endif /* CONFIG_SYS_NIOS_FIXEDBAUD */
@@ -65,7 +57,7 @@ int serial_init (void)
 /*-----------------------------------------------------------------------
  * UART CONSOLE
  *---------------------------------------------------------------------*/
-void serial_putc (char c)
+static void altera_serial_putc(char c)
 {
        if (c == '\n')
                serial_putc ('\r');
@@ -74,21 +66,35 @@ void serial_putc (char c)
        writel ((unsigned char)c, &uart->txdata);
 }
 
-void serial_puts (const char *s)
-{
-       while (*s != 0) {
-               serial_putc (*s++);
-       }
-}
-
-int serial_tstc (void)
+static int altera_serial_tstc(void)
 {
        return (readl (&uart->status) & NIOS_UART_RRDY);
 }
 
-int serial_getc (void)
+static int altera_serial_getc(void)
 {
        while (serial_tstc () == 0)
                WATCHDOG_RESET ();
        return (readl (&uart->rxdata) & 0x00ff );
 }
+
+static struct serial_device altera_serial_drv = {
+       .name   = "altera_serial",
+       .start  = altera_serial_init,
+       .stop   = NULL,
+       .setbrg = altera_serial_setbrg,
+       .putc   = altera_serial_putc,
+       .puts   = default_serial_puts,
+       .getc   = altera_serial_getc,
+       .tstc   = altera_serial_tstc,
+};
+
+void altera_serial_initialize(void)
+{
+       serial_register(&altera_serial_drv);
+}
+
+__weak struct serial_device *default_serial_console(void)
+{
+       return &altera_serial_drv;
+}