MIPS: Octeon: Serial port fixes for OCTEON simulator.

For the simulator, fake a slow clock to get fast output.

In prom_putchar we have to mask the value so the simulator doesn't
ASSERT when printing non-ASCII characters.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1255/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/cavium-octeon/serial.c b/arch/mips/cavium-octeon/serial.c
index 8240728d485a563f1598fea7f58318301c932444..83eac37a1ff976a92bca4134b21591dfa179997a 100644 (file)
--- 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 44cb20cd3bdc0cf36998b92d315700a78b1913b9..d1b5ffaf02819f75d8a123cdeea74e3430aa2025 100644 (file)
--- 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;
 }