Merge remote-tracking branch 'u-boot-ti/master'

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

diff --git a/drivers/serial/opencores_yanu.c b/drivers/serial/opencores_yanu.c
index f18f7f444e119b5692759ce06c9e7ed1b38f581f..4ca6ef0b252008834c834f2e0e332cead86170ab 100644 (file)
--- a/drivers/serial/opencores_yanu.c
+++ b/drivers/serial/opencores_yanu.c
@@ -37,7 +37,7 @@ static yanu_uart_t *uart = (yanu_uart_t *)CONFIG_SYS_NIOS_CONSOLE;
 
 /* Everything's already setup for fixed-baud PTF assignment*/
 
-void serial_setbrg (void)
+static void oc_serial_setbrg(void)
 {
        int n, k;
        const unsigned max_uns = 0xFFFFFFFF;
@@ -68,8 +68,8 @@ void serial_setbrg (void)
 
 #else
 
-void serial_setbrg (void)
-{      
+static void oc_serial_setbrg(void)
+{
        int n, k;
        const unsigned max_uns = 0xFFFFFFFF;
        unsigned best_n, best_m, baud;
@@ -100,7 +100,7 @@ void serial_setbrg (void)
 
 #endif /* CONFIG_SYS_NIOS_FIXEDBAUD */
 
-int serial_init (void)
+static int oc_serial_init(void)
 {
        unsigned action,control;
 
@@ -114,12 +114,14 @@ int serial_init (void)
            YANU_ACTION_RFE | YANU_ACTION_RFIFO_CLEAR | YANU_ACTION_TFIFO_CLEAR;
 
        writel(action, &uart->action);
-       
-       /*  control register cleanup */
-       /* no interrupts enabled */
-       /* one stop bit */
-       /* hardware flow control disabled */
-       /* 8 bits */
+
+       /*
+        * control register cleanup
+        * no interrupts enabled
+        * one stop bit
+        * hardware flow control disabled
+        * 8 bits
+        */
        control = (0x7 << YANU_CONTROL_BITS_POS);
        /* enven parity just to be clean */
        control |= YANU_CONTROL_PAREVEN;
@@ -139,14 +141,14 @@ int serial_init (void)
 /*-----------------------------------------------------------------------
  * YANU CONSOLE
  *---------------------------------------------------------------------*/
-void serial_putc (char c)
+static void oc_serial_putc(char c)
 {
        int tx_chars;
        unsigned status;
 
        if (c == '\n')
                serial_putc ('\r');
-       
+
        while (1) {
                status = readl(&uart->status);
                tx_chars = (status>>YANU_TFIFO_CHARS_POS)
@@ -159,30 +161,43 @@ void serial_putc (char c)
        writel((unsigned char)c, &uart->data);
 }
 
-void serial_puts (const char *s)
-{
-       while (*s != 0) {
-               serial_putc (*s++);
-       }
-}
-
-
-int serial_tstc(void)
+static int oc_serial_tstc(void)
 {
        unsigned status ;
 
        status = readl(&uart->status);
        return (((status >> YANU_RFIFO_CHARS_POS) &
                 ((1 << YANU_RFIFO_CHARS_N) - 1)) > 0);
-}      
+}
 
-int serial_getc (void)
+statoc int oc_serial_getc(void)
 {
        while (serial_tstc() == 0)
                WATCHDOG_RESET ();
-       
+
        /* first we pull the char */
        writel(YANU_ACTION_RFIFO_PULL, &uart->action);
 
        return(readl(&uart->data) & YANU_DATA_CHAR_MASK);
 }
+
+static struct serial_device oc_serial_drv = {
+       .name   = "oc_serial",
+       .start  = oc_serial_init,
+       .stop   = NULL,
+       .setbrg = oc_serial_setbrg,
+       .putc   = oc_serial_putc,
+       .puts   = default_serial_puts,
+       .getc   = oc_serial_getc,
+       .tstc   = oc_serial_tstc,
+};
+
+void oc_serial_initialize(void)
+{
+       serial_register(&oc_serial_drv);
+}
+
+__weak struct serial_device *default_serial_console(void)
+{
+       return &oc_serial_drv;
+}