Merge branch 'next'

[karo-tx-uboot.git] / drivers / serial / serial_lpc2292.c

diff --git a/drivers/serial/serial_lpc2292.c b/drivers/serial/serial_lpc2292.c
index 87b7d5f411ace864f8b3608a54f690170044d5ec..8abc476713599c480f3dfde7b84a65ff2809e360 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,23 +83,35 @@ 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)
+/* Test if there is a byte to read */
+static int lpc2292_serial_tstc(void)
 {
-       while (*s) {
-               serial_putc (*s++);
-       }
+       return (GET8(U0LSR) & 1);
 }
 
-/* Test if there is a byte to read */
-int serial_tstc (void)
+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   = default_serial_puts,
+       .getc   = lpc2292_serial_getc,
+       .tstc   = lpc2292_serial_tstc,
+};
+
+void lpc2292_serial_initialize(void)
 {
-       return (GET8(U0LSR) & 1);
+       serial_register(&lpc2292_serial_drv);
 }
 
+__weak struct serial_device *default_serial_console(void)
+{
+       return &lpc2292_serial_drv;
+}