summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/serial.c2
-rw-r--r--drivers/serial/serial_imx.c68
2 files changed, 63 insertions, 7 deletions
diff --git a/common/serial.c b/common/serial.c
index 0e0e00b..17a3790 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -81,6 +81,7 @@ serial_initfunc(s3c4510b_serial_initialize);
serial_initfunc(s3c64xx_serial_initialize);
serial_initfunc(sandbox_serial_initialize);
serial_initfunc(clps7111_serial_initialize);
+serial_initfunc(imx_serial_initialize);
void serial_register(struct serial_device *dev)
{
@@ -140,6 +141,7 @@ void serial_initialize(void)
s3c64xx_serial_initialize();
sandbox_serial_initialize();
clps7111_serial_initialize();
+ imx_serial_initialize();
serial_assign(default_serial_console()->name);
}
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c
index b9ca748..d37ec29 100644
--- a/drivers/serial/serial_imx.c
+++ b/drivers/serial/serial_imx.c
@@ -19,6 +19,8 @@
#include <common.h>
#include <asm/arch/imx-regs.h>
+#include <serial.h>
+#include <linux/compiler.h>
#if defined CONFIG_IMX_SERIAL1
#define UART_BASE IMX_UART1_BASE
@@ -50,7 +52,7 @@ struct imx_serial {
DECLARE_GLOBAL_DATA_PTR;
-void serial_setbrg (void)
+static void imx_serial_setbrg(void)
{
serial_init();
}
@@ -62,7 +64,7 @@ extern void imx_gpio_mode(int gpio_mode);
* are always 8 data bits, no parity, 1 stop bit, no start bits.
*
*/
-int serial_init (void)
+static int imx_serial_init(void)
{
volatile struct imx_serial* base = (struct imx_serial *)UART_BASE;
unsigned int ufcr_rfdiv;
@@ -163,7 +165,7 @@ int serial_init (void)
* otherwise. When the function is successful, the character read is
* written into its argument c.
*/
-int serial_getc (void)
+static int imx_serial_getc(void)
{
volatile struct imx_serial* base = (struct imx_serial *)UART_BASE;
unsigned char ch;
@@ -185,7 +187,7 @@ int hwflow_onoff(int on)
/*
* Output a single byte to the serial port.
*/
-void serial_putc (const char c)
+static void imx_serial_putc(const char c)
{
volatile struct imx_serial* base = (struct imx_serial *)UART_BASE;
@@ -202,7 +204,7 @@ void serial_putc (const char c)
/*
* Test whether a character is in the RX buffer
*/
-int serial_tstc (void)
+static int imx_serial_tstc(void)
{
volatile struct imx_serial* base = (struct imx_serial *)UART_BASE;
@@ -212,10 +214,62 @@ int serial_tstc (void)
return 1;
}
-void
-serial_puts (const char *s)
+static void imx_serial_puts(const char *s)
{
while (*s) {
serial_putc (*s++);
}
}
+
+#ifdef CONFIG_SERIAL_MULTI
+static struct serial_device imx_serial_drv = {
+ .name = "imx_serial",
+ .start = imx_serial_init,
+ .stop = NULL,
+ .setbrg = imx_serial_setbrg,
+ .putc = imx_serial_putc,
+ .puts = imx_serial_puts,
+ .getc = imx_serial_getc,
+ .tstc = imx_serial_tstc,
+};
+
+void imx_serial_initialize(void)
+{
+ serial_register(&imx_serial_drv);
+}
+
+__weak struct serial_device *default_serial_console(void)
+{
+ return &imx_serial_drv;
+}
+#else
+int serial_init(void)
+{
+ return imx_serial_init();
+}
+
+void serial_setbrg(void)
+{
+ imx_serial_setbrg();
+}
+
+void serial_putc(const char c)
+{
+ imx_serial_putc(c);
+}
+
+void serial_puts(const char *s)
+{
+ imx_serial_puts(s);
+}
+
+int serial_getc(void)
+{
+ return imx_serial_getc();
+}
+
+int serial_tstc(void)
+{
+ return imx_serial_tstc();
+}
+#endif