Commit 66b375bf authored by Tom Rini's avatar Tom Rini Committed by Linus Torvalds

[PATCH] ppc32: In the boot code, don't rely on BASE_BAUD directly

Modifies serial_init to get base baud rate from the rs_table entry instead
of BAUD_BASE.  This patch eliminates duplication between the
SERIAL_PORT_DFNS macro and BAUD_BASE.  Without the patch, if a port set the
baud rate in SERIAL_PORT_DFNS, but did not update BASE_BAUD, the BASE_BAUD
value would still be used.
Signed-off-by: default avatarGrant Likely <grant.likely@gdcanada.com>
Signed-off-by: default avatarTom Rini <trini@kernel.crashing.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 99cc2192
...@@ -23,7 +23,7 @@ static int shift; ...@@ -23,7 +23,7 @@ static int shift;
unsigned long serial_init(int chan, void *ignored) unsigned long serial_init(int chan, void *ignored)
{ {
unsigned long com_port; unsigned long com_port, base_baud;
unsigned char lcr, dlm; unsigned char lcr, dlm;
/* We need to find out which type io we're expecting. If it's /* We need to find out which type io we're expecting. If it's
...@@ -43,6 +43,8 @@ unsigned long serial_init(int chan, void *ignored) ...@@ -43,6 +43,8 @@ unsigned long serial_init(int chan, void *ignored)
/* How far apart the registers are. */ /* How far apart the registers are. */
shift = rs_table[chan].iomem_reg_shift; shift = rs_table[chan].iomem_reg_shift;
/* Base baud.. */
base_baud = rs_table[chan].baud_base;
/* save the LCR */ /* save the LCR */
lcr = inb(com_port + (UART_LCR << shift)); lcr = inb(com_port + (UART_LCR << shift));
...@@ -62,9 +64,9 @@ unsigned long serial_init(int chan, void *ignored) ...@@ -62,9 +64,9 @@ unsigned long serial_init(int chan, void *ignored)
else { else {
/* Input clock. */ /* Input clock. */
outb(com_port + (UART_DLL << shift), outb(com_port + (UART_DLL << shift),
(BASE_BAUD / SERIAL_BAUD) & 0xFF); (base_baud / SERIAL_BAUD) & 0xFF);
outb(com_port + (UART_DLM << shift), outb(com_port + (UART_DLM << shift),
(BASE_BAUD / SERIAL_BAUD) >> 8); (base_baud / SERIAL_BAUD) >> 8);
/* 8 data, 1 stop, no parity */ /* 8 data, 1 stop, no parity */
outb(com_port + (UART_LCR << shift), 0x03); outb(com_port + (UART_LCR << shift), 0x03);
/* RTS/DTR */ /* RTS/DTR */
......
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