Merge branch 'master' of git://git.denx.de/u-boot-spi

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

diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c
index e63d25d7949a47bbd73efc97e80685d162215c19..b21b12ba44238cc23a519063c32e51b2198c173d 100644 (file)
--- a/drivers/serial/serial_arc.c
+++ b/drivers/serial/serial_arc.c
@@ -38,8 +38,24 @@ static void arc_serial_setbrg(void)
                gd->baudrate = CONFIG_BAUDRATE;
 
        arc_console_baud = gd->cpu_clk / (gd->baudrate * 4) - 1;
-       writel(arc_console_baud & 0xff, &regs->baudl);
-       writel((arc_console_baud & 0xff00) >> 8, &regs->baudh);
+       writeb(arc_console_baud & 0xff, &regs->baudl);
+
+#ifdef CONFIG_ARC
+       /*
+        * UART ISS(Instruction Set simulator) emulation has a subtle bug:
+        * A existing value of Baudh = 0 is used as a indication to startup
+        * it's internal state machine.
+        * Thus if baudh is set to 0, 2 times, it chokes.
+        * This happens with BAUD=115200 and the formaula above
+        * Until that is fixed, when running on ISS, we will set baudh to !0
+        */
+       if (gd->arch.running_on_hw)
+               writeb((arc_console_baud & 0xff00) >> 8, &regs->baudh);
+       else
+               writeb(1, &regs->baudh);
+#else
+       writeb((arc_console_baud & 0xff00) >> 8, &regs->baudh);
+#endif
 }
 
 static int arc_serial_init(void)
@@ -54,15 +70,15 @@ static void arc_serial_putc(const char c)
        if (c == '\n')
                arc_serial_putc('\r');
 
-       while (!(readl(&regs->status) & UART_TXEMPTY))
+       while (!(readb(&regs->status) & UART_TXEMPTY))
                ;
 
-       writel(c, &regs->data);
+       writeb(c, &regs->data);
 }
 
 static int arc_serial_tstc(void)
 {
-       return !(readl(&regs->status) & UART_RXEMPTY);
+       return !(readb(&regs->status) & UART_RXEMPTY);
 }
 
 static int arc_serial_getc(void)
@@ -71,10 +87,10 @@ static int arc_serial_getc(void)
                ;
 
        /* Check for overflow errors */
-       if (readl(&regs->status) & UART_OVERFLOW_ERR)
+       if (readb(&regs->status) & UART_OVERFLOW_ERR)
                return 0;
 
-       return readl(&regs->data) & 0xFF;
+       return readb(&regs->data) & 0xFF;
 }
 
 static void arc_serial_puts(const char *s)