2 files changed, 6 insertions, 2 deletions

diff --git a/arch/mips/cavium-octeon/serial.c b/arch/mips/cavium-octeon/serial.c
index 8240728d485a..83eac37a1ff9 100644
--- a/arch/mips/cavium-octeon/serial.c
+++ b/arch/mips/cavium-octeon/serial.c
@@ -65,7 +65,11 @@ static void __init octeon_uart_set_common(struct plat_serial8250_port *p)
         p->type = PORT_OCTEON;
         p->iotype = UPIO_MEM;
         p->regshift = 3;        /* I/O addresses are every 8 bytes */
-        p->uartclk = mips_hpt_frequency;
+        if (octeon_is_simulation())
+                /* Make simulator output fast*/
+                p->uartclk = 115200 * 16;
+        else
+                p->uartclk = mips_hpt_frequency;
         p->serial_in = octeon_serial_in;
         p->serial_out = octeon_serial_out;
 }
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 44cb20cd3bdc..d1b5ffaf0281 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -702,7 +702,7 @@ int prom_putchar(char c)
         } while ((lsrval & 0x20) == 0);
 
         /* Write the byte */
-        cvmx_write_csr(CVMX_MIO_UARTX_THR(octeon_uart), c);
+        cvmx_write_csr(CVMX_MIO_UARTX_THR(octeon_uart), c & 0xffull);
         return 1;
 }