serial: powerpc: Implement CONFIG_SERIAL_MULTI into iop480 serial driver

Implement support for CONFIG_SERIAL_MULTI into iop480 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 iop480 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: Anatolij Gustschin <agust@denx.de>
Cc: Stefan Roese <sr@denx.de>

diff --git a/arch/powerpc/cpu/ppc4xx/iop480_uart.c b/arch/powerpc/cpu/ppc4xx/iop480_uart.c
index 027ca30c253218750ce6b53693ddf8c27e72d5b2..fb25e15902bfd62921b924c169883ea7fa5a38a0 100644 (file)
--- a/arch/powerpc/cpu/ppc4xx/iop480_uart.c
+++ b/arch/powerpc/cpu/ppc4xx/iop480_uart.c
@@ -29,6 +29,7 @@
 
 #ifdef CONFIG_SERIAL_MULTI
 #include <serial.h>
+#include <linux/compiler.h>
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -132,7 +133,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * as serial console interface.
  */
 
-int serial_init (void)
+static int iop480_serial_init(void)
 {
        unsigned short br_reg;
 
@@ -153,7 +154,7 @@ int serial_init (void)
        return (0);
 }
 
-void serial_setbrg (void)
+static void iop480_serial_setbrg(void)
 {
        unsigned short br_reg;
 
@@ -165,7 +166,7 @@ void serial_setbrg (void)
              ((br_reg & 0xff00) >> 8)); /* ... */
 }
 
-void serial_putc (const char c)
+static void iop480_serial_putc(const char c)
 {
        if (c == '\n')
                serial_putc ('\r');
@@ -182,14 +183,14 @@ void serial_putc (const char c)
        }
 }
 
-void serial_puts (const char *s)
+static void iop480_serial_puts(const char *s)
 {
        while (*s) {
                serial_putc (*s++);
        }
 }
 
-int serial_getc ()
+static int iop480_serial_getc(void)
 {
        unsigned char status = 0;
 
@@ -212,7 +213,7 @@ int serial_getc ()
        return (0x000000ff & (int) in_8((u8 *)asyncRxBufferport1));
 }
 
-int serial_tstc ()
+static int iop480_serial_tstc(void)
 {
        unsigned char status;
 
@@ -233,4 +234,56 @@ int serial_tstc ()
        return 0;
 }
 
+#ifdef CONFIG_SERIAL_MULTI
+static struct serial_device iop480_serial_drv = {
+       .name   = "iop480_serial",
+       .start  = iop480_serial_init,
+       .stop   = NULL,
+       .setbrg = iop480_serial_setbrg,
+       .putc   = iop480_serial_putc,
+       .puts   = iop480_serial_puts,
+       .getc   = iop480_serial_getc,
+       .tstc   = iop480_serial_tstc,
+};
+
+void iop480_serial_initialize(void)
+{
+       serial_register(&iop480_serial_drv);
+}
+
+__weak struct serial_device *default_serial_console(void)
+{
+       return &iop480_serial_drv;
+}
+#else
+int serial_init(void)
+{
+       return iop480_serial_init();
+}
+
+void serial_setbrg(void)
+{
+       iop480_serial_setbrg();
+}
+
+void serial_putc(const char c)
+{
+       iop480_serial_putc(c);
+}
+
+void serial_puts(const char *s)
+{
+       iop480_serial_puts(s);
+}
+
+int serial_getc(void)
+{
+       return iop480_serial_getc();
+}
+
+int serial_tstc(void)
+{
+       return iop480_serial_tstc();
+}
+#endif
 #endif /* CONFIG_IOP480 */

diff --git a/common/serial.c b/common/serial.c
index 811db952d802f9bac0556ea4cbbed517242907e4..07573d19f32ff4ad3170ab71c6978b49cd55b534 100644 (file)
--- a/common/serial.c
+++ b/common/serial.c
@@ -58,6 +58,7 @@ serial_initfunc(mpc8220_serial_initialize);
 serial_initfunc(mpc8260_scc_serial_initialize);
 serial_initfunc(mpc8260_smc_serial_initialize);
 serial_initfunc(mpc85xx_serial_initialize);
+serial_initfunc(iop480_serial_initialize);
 
 void serial_register(struct serial_device *dev)
 {
@@ -94,6 +95,7 @@ void serial_initialize(void)
        mpc8260_scc_serial_initialize();
        mpc8260_smc_serial_initialize();
        mpc85xx_serial_initialize();
+       iop480_serial_initialize();
 
        serial_assign(default_serial_console()->name);
 }