summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-07-04 14:11:23 +1000
committerPaul Mackerras <paulus@samba.org>2006-07-07 20:19:15 +1000
commite70e943847bdae13175bf3a8bca6328e369de90a (patch)
tree98e5fdede7ccf87f70d557e148bb379d2a5bea56
parent1e031d65b0cb5f882b20ebc356ea0345ff18dbf0 (diff)
downloadblackbird-op-linux-e70e943847bdae13175bf3a8bca6328e369de90a.tar.gz
blackbird-op-linux-e70e943847bdae13175bf3a8bca6328e369de90a.zip
[POWERPC] Fix default clock for udbg_16550
This patch makes it possible to provide 0 as the clock value for udbg_16550, making it default to the standard 1.8432Mhz clock Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/udbg_16550.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c
index 0835b4841dea..2d17f2b8eda7 100644
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
@@ -81,10 +81,14 @@ static int udbg_550_getc(void)
void udbg_init_uart(void __iomem *comport, unsigned int speed,
unsigned int clock)
{
- unsigned int dll, base_bauds = clock / 16;
+ unsigned int dll, base_bauds;
+ if (clock == 0)
+ clock = 1843200;
if (speed == 0)
speed = 9600;
+
+ base_bauds = clock / 16;
dll = base_bauds / speed;
if (comport) {
OpenPOWER on IntegriCloud