serial: arm: Implement CONFIG_SERIAL_MULTI into mxc serial driver

Implement support for CONFIG_SERIAL_MULTI into mxc 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 mxc 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: Stefano Babic <sbabic@denx.de>

diff --git a/common/serial.c b/common/serial.c
index 3152873905fd85455c80dc85dfc19201927f78b8..1ac8625fa552609628f9da015ab11a20f3007752 100644 (file)
--- a/common/serial.c
+++ b/common/serial.c
@@ -87,6 +87,7 @@ serial_initfunc(ks8695_serial_initialize);
 serial_initfunc(lh7a40x_serial_initialize);
 serial_initfunc(lpc2292_serial_initialize);
 serial_initfunc(max3100_serial_initialize);
+serial_initfunc(mxc_serial_initialize);
 
 void serial_register(struct serial_device *dev)
 {
@@ -152,6 +153,7 @@ void serial_initialize(void)
        lh7a40x_serial_initialize();
        lpc2292_serial_initialize();
        max3100_serial_initialize();
+       mxc_serial_initialize();
 
        serial_assign(default_serial_console()->name);
 }

diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c
index af00b9c0ec426856eaf716466d087f9cf270cc72..0899e9bc812647f0d3ed4f87792adaf4f7f41f66 100644 (file)
--- a/drivers/serial/serial_mxc.c
+++ b/drivers/serial/serial_mxc.c
@@ -21,6 +21,8 @@
 #include <watchdog.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <serial.h>
+#include <linux/compiler.h>
 
 #define __REG(x)     (*((volatile u32 *)(x)))
 
@@ -145,7 +147,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void serial_setbrg (void)
+static void mxc_serial_setbrg(void)
 {
        u32 clk = imx_get_uartclk();
 
@@ -158,14 +160,14 @@ void serial_setbrg (void)
 
 }
 
-int serial_getc (void)
+static int mxc_serial_getc(void)
 {
        while (__REG(UART_PHYS + UTS) & UTS_RXEMPTY)
                WATCHDOG_RESET();
        return (__REG(UART_PHYS + URXD) & URXD_RX_DATA); /* mask out status from upper word */
 }
 
-void serial_putc (const char c)
+static void mxc_serial_putc(const char c)
 {
        __REG(UART_PHYS + UTXD) = c;
 
@@ -181,7 +183,7 @@ void serial_putc (const char c)
 /*
  * Test whether a character is in the RX buffer
  */
-int serial_tstc (void)
+static int mxc_serial_tstc(void)
 {
        /* If receive fifo is empty, return false */
        if (__REG(UART_PHYS + UTS) & UTS_RXEMPTY)
@@ -189,8 +191,7 @@ int serial_tstc (void)
        return 1;
 }
 
-void
-serial_puts (const char *s)
+static void mxc_serial_puts(const char *s)
 {
        while (*s) {
                serial_putc (*s++);
@@ -202,7 +203,7 @@ serial_puts (const char *s)
  * are always 8 data bits, no parity, 1 stop bit, no start bits.
  *
  */
-int serial_init (void)
+static int mxc_serial_init(void)
 {
        __REG(UART_PHYS + UCR1) = 0x0;
        __REG(UART_PHYS + UCR2) = 0x0;
@@ -224,3 +225,56 @@ int serial_init (void)
 
        return 0;
 }
+
+#ifdef CONFIG_SERIAL_MULTI
+static struct serial_device mxc_serial_drv = {
+       .name   = "mxc_serial",
+       .start  = mxc_serial_init,
+       .stop   = NULL,
+       .setbrg = mxc_serial_setbrg,
+       .putc   = mxc_serial_putc,
+       .puts   = mxc_serial_puts,
+       .getc   = mxc_serial_getc,
+       .tstc   = mxc_serial_tstc,
+};
+
+void mxc_serial_initialize(void)
+{
+       serial_register(&mxc_serial_drv);
+}
+
+__weak struct serial_device *default_serial_console(void)
+{
+       return &mxc_serial_drv;
+}
+#else
+int serial_init(void)
+{
+       return mxc_serial_init();
+}
+
+void serial_setbrg(void)
+{
+       mxc_serial_setbrg();
+}
+
+void serial_putc(const char c)
+{
+       mxc_serial_putc(c);
+}
+
+void serial_puts(const char *s)
+{
+       mxc_serial_puts(s);
+}
+
+int serial_getc(void)
+{
+       return mxc_serial_getc();
+}
+
+int serial_tstc(void)
+{
+       return mxc_serial_tstc();
+}
+#endif