serial: sparc: Implement CONFIG_SERIAL_MULTI into leon3 serial driver

Implement support for CONFIG_SERIAL_MULTI into leon3 serial driver.
This driver was so far only usable directly, but this patch also adds
support for the multi method. This allows using more than one serial
driver alongside the leon3 driver. Also, add a weak implementation
of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
Cc: Peter Tyser <ptyser@xes-inc.com>

diff --git a/arch/sparc/cpu/leon3/serial.c b/arch/sparc/cpu/leon3/serial.c
index 4b2fcb8667c4b5cd3b19314a318e225f3aad1551..a110244c9ef76ebbff89128cf553e5ba843d89dc 100644 (file)
--- a/arch/sparc/cpu/leon3/serial.c
+++ b/arch/sparc/cpu/leon3/serial.c
@@ -27,6 +27,8 @@
 #include <asm/processor.h>
 #include <asm/leon.h>
 #include <ambapp.h>
+#include <serial.h>
+#include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -42,7 +44,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 ambapp_dev_apbuart *leon3_apbuart = NULL;
 
-int serial_init(void)
+static int leon3_serial_init(void)
 {
        ambapp_apbdev apbdev;
        unsigned int tmp;
@@ -72,15 +74,7 @@ int serial_init(void)
        return -1;              /* didn't find hardware */
 }
 
-void serial_putc(const char c)
-{
-       if (c == '\n')
-               serial_putc_raw('\r');
-
-       serial_putc_raw(c);
-}
-
-void serial_putc_raw(const char c)
+static void leon3_serial_putc_raw(const char c)
 {
        if (!leon3_apbuart)
                return;
@@ -97,14 +91,22 @@ void serial_putc_raw(const char c)
 #endif
 }
 
-void serial_puts(const char *s)
+static void leon3_serial_putc(const char c)
+{
+       if (c == '\n')
+               leon3_serial_putc_raw('\r');
+
+       leon3_serial_putc_raw(c);
+}
+
+static void leon3_serial_puts(const char *s)
 {
        while (*s) {
                serial_putc(*s++);
        }
 }
 
-int serial_getc(void)
+static int leon3_serial_getc(void)
 {
        if (!leon3_apbuart)
                return 0;
@@ -116,7 +118,7 @@ int serial_getc(void)
        return READ_WORD(leon3_apbuart->data);
 }
 
-int serial_tstc(void)
+static int leon3_serial_tstc(void)
 {
        if (leon3_apbuart)
                return (READ_WORD(leon3_apbuart->status) &
@@ -125,7 +127,7 @@ int serial_tstc(void)
 }
 
 /* set baud rate for uart */
-void serial_setbrg(void)
+static void leon3_serial_setbrg(void)
 {
        /* update baud rate settings, read it from gd->baudrate */
        unsigned int scaler;
@@ -137,3 +139,56 @@ void serial_setbrg(void)
        }
        return;
 }
+
+#ifdef CONFIG_SERIAL_MULTI
+static struct serial_device leon3_serial_drv = {
+       .name   = "leon3_serial",
+       .start  = leon3_serial_init,
+       .stop   = NULL,
+       .setbrg = leon3_serial_setbrg,
+       .putc   = leon3_serial_putc,
+       .puts   = leon3_serial_puts,
+       .getc   = leon3_serial_getc,
+       .tstc   = leon3_serial_tstc,
+};
+
+void leon3_serial_initialize(void)
+{
+       serial_register(&leon3_serial_drv);
+}
+
+__weak struct serial_device *default_serial_console(void)
+{
+       return &leon3_serial_drv;
+}
+#else
+int serial_init(void)
+{
+       return leon3_serial_init();
+}
+
+void serial_setbrg(void)
+{
+       leon3_serial_setbrg();
+}
+
+void serial_putc(const char c)
+{
+       leon3_serial_putc(c);
+}
+
+void serial_puts(const char *s)
+{
+       leon3_serial_puts(s);
+}
+
+int serial_getc(void)
+{
+       return leon3_serial_getc();
+}
+
+int serial_tstc(void)
+{
+       return leon3_serial_tstc();
+}
+#endif

diff --git a/common/serial.c b/common/serial.c
index 34a6530d9a65dfad163b33fdbf5c028648c04a6a..14a56281c0f2ce5d73c1baf0e8c7816291f5bc3b 100644 (file)
--- a/common/serial.c
+++ b/common/serial.c
@@ -60,6 +60,7 @@ serial_initfunc(mpc8260_smc_serial_initialize);
 serial_initfunc(mpc85xx_serial_initialize);
 serial_initfunc(iop480_serial_initialize);
 serial_initfunc(leon2_serial_initialize);
+serial_initfunc(leon3_serial_initialize);
 
 void serial_register(struct serial_device *dev)
 {
@@ -98,6 +99,7 @@ void serial_initialize(void)
        mpc85xx_serial_initialize();
        iop480_serial_initialize();
        leon2_serial_initialize();
+       leon3_serial_initialize();
 
        serial_assign(default_serial_console()->name);
 }