Commit 606c958e authored by David Daney's avatar David Daney Committed by Ralf Baechle

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: default avatarDavid Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1255/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 1dd5216e
No related merge requests found
...@@ -65,7 +65,11 @@ static void __init octeon_uart_set_common(struct plat_serial8250_port *p) ...@@ -65,7 +65,11 @@ static void __init octeon_uart_set_common(struct plat_serial8250_port *p)
p->type = PORT_OCTEON; p->type = PORT_OCTEON;
p->iotype = UPIO_MEM; p->iotype = UPIO_MEM;
p->regshift = 3; /* I/O addresses are every 8 bytes */ 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_in = octeon_serial_in;
p->serial_out = octeon_serial_out; p->serial_out = octeon_serial_out;
} }
......
...@@ -702,7 +702,7 @@ int prom_putchar(char c) ...@@ -702,7 +702,7 @@ int prom_putchar(char c)
} while ((lsrval & 0x20) == 0); } while ((lsrval & 0x20) == 0);
/* Write the byte */ /* 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; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment