From 474139e7f47ce4ee666c5ac1d325dfdade1bbf30 Mon Sep 17 00:00:00 2001 From: David Daney Date: Wed, 19 May 2010 14:16:32 -0700 Subject: [PATCH] --- yaml --- r: 196795 b: refs/heads/master c: 606c958e2857d29106b8d3b2fc30e22f376c80c5 h: refs/heads/master i: 196793: ac1369837036f8606842ca6346a9d72049928118 196791: 8288bc64ee84e4d200fe8007636ec764312c3cc5 v: v3 --- [refs] | 2 +- trunk/arch/mips/cavium-octeon/serial.c | 6 +++++- trunk/arch/mips/cavium-octeon/setup.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d632087d520a..4e806892ce0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1dd5216e80318b4cb25c1785f5d11a6f042f0a3b +refs/heads/master: 606c958e2857d29106b8d3b2fc30e22f376c80c5 diff --git a/trunk/arch/mips/cavium-octeon/serial.c b/trunk/arch/mips/cavium-octeon/serial.c index 8240728d485a..83eac37a1ff9 100644 --- a/trunk/arch/mips/cavium-octeon/serial.c +++ b/trunk/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/trunk/arch/mips/cavium-octeon/setup.c b/trunk/arch/mips/cavium-octeon/setup.c index 44cb20cd3bdc..d1b5ffaf0281 100644 --- a/trunk/arch/mips/cavium-octeon/setup.c +++ b/trunk/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; }