serial: arm: Implement CONFIG_SERIAL_MULTI into lpc2292 serial driver

Implement support for CONFIG_SERIAL_MULTI into lpc2292 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 lpc2292 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>

diff --git a/common/serial.c b/common/serial.c
index 72ce0951ceaaa9864942397dabe8951087e16825..6d5eb448ad22b806dfc31c32b6ff49cea75b4c60 100644 (file)
--- a/common/serial.c
+++ b/common/serial.c
@@ -85,6 +85,7 @@ serial_initfunc(imx_serial_initialize);
 serial_initfunc(ixp_serial_initialize);
 serial_initfunc(ks8695_serial_initialize);
 serial_initfunc(lh7a40x_serial_initialize);
+serial_initfunc(lpc2292_serial_initialize);
 
 void serial_register(struct serial_device *dev)
 {
@@ -148,6 +149,7 @@ void serial_initialize(void)
        ixp_serial_initialize();
        ks8695_serial_initialize();
        lh7a40x_serial_initialize();
+       lpc2292_serial_initialize();
 
        serial_assign(default_serial_console()->name);
 }

diff --git a/drivers/serial/serial_lpc2292.c b/drivers/serial/serial_lpc2292.c
index e3a60b6cb4313de8f83fdf293c2db0d0b9de0f8b..2601ee79c33b5379a0c28dd79f03d55b5f09c91d 100644 (file)
--- a/drivers/serial/serial_lpc2292.c
+++ b/drivers/serial/serial_lpc2292.c
@@ -33,7 +33,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void serial_setbrg (void)
+static void lpc2292_serial_setbrg(void)
 {
        unsigned short divisor = 0;
 
@@ -57,7 +57,7 @@ void serial_setbrg (void)
        PUT8(U0FCR, 1);         /* Enable RX and TX FIFOs */
 }
 
-int serial_init (void)
+static int lpc2292_serial_init(void)
 {
        unsigned long pinsel0;
 
@@ -71,7 +71,7 @@ int serial_init (void)
        return (0);
 }
 
-void serial_putc (const char c)
+static void lpc2292_serial_putc(const char c)
 {
        if (c == '\n')
        {
@@ -83,14 +83,13 @@ void serial_putc (const char c)
        PUT8(U0THR, c);
 }
 
-int serial_getc (void)
+static int lpc2292_serial_getc(void)
 {
        while((GET8(U0LSR) & 1) == 0);
        return GET8(U0RBR);
 }
 
-void
-serial_puts (const char *s)
+static void lpc2292_serial_puts(const char *s)
 {
        while (*s) {
                serial_putc (*s++);
@@ -98,7 +97,60 @@ serial_puts (const char *s)
 }
 
 /* Test if there is a byte to read */
-int serial_tstc (void)
+static int lpc2292_serial_tstc(void)
 {
        return (GET8(U0LSR) & 1);
 }
+
+#ifdef CONFIG_SERIAL_MULTI
+static struct serial_device lpc2292_serial_drv = {
+       .name   = "lpc2292_serial",
+       .start  = lpc2292_serial_init,
+       .stop   = NULL,
+       .setbrg = lpc2292_serial_setbrg,
+       .putc   = lpc2292_serial_putc,
+       .puts   = lpc2292_serial_puts,
+       .getc   = lpc2292_serial_getc,
+       .tstc   = lpc2292_serial_tstc,
+};
+
+void lpc2292_serial_initialize(void)
+{
+       serial_register(&lpc2292_serial_drv);
+}
+
+__weak struct serial_device *default_serial_console(void)
+{
+       return &lpc2292_serial_drv;
+}
+#else
+int serial_init(void)
+{
+       return lpc2292_serial_init();
+}
+
+void serial_setbrg(void)
+{
+       lpc2292_serial_setbrg();
+}
+
+void serial_putc(const char c)
+{
+       lpc2292_serial_putc(c);
+}
+
+void serial_puts(const char *s)
+{
+       lpc2292_serial_puts(s);
+}
+
+int serial_getc(void)
+{
+       return lpc2292_serial_getc();
+}
+
+int serial_tstc(void)
+{
+       return lpc2292_serial_tstc();
+}
+#endif