diff options
| author |   David Woodhouse <dwmw2@infradead.org> | 2005-11-24 17:08:56 +0000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2006-01-09 14:50:42 +1100 |
| commit | 31df1678d7732b94178a6e457ed6666e4431212f (patch) | |
| tree | e464f609dd5fa95a28da60127c79db24bd44152e /arch/powerpc/kernel/legacy_serial.c | |
| parent | [PATCH] powerpc: Fix g5 build with xmon (diff) | |
| download | linux-dev-31df1678d7732b94178a6e457ed6666e4431212f.tar.xz linux-dev-31df1678d7732b94178a6e457ed6666e4431212f.zip | |
[PATCH] powerpc: serial port discovery: cope with broken firmware
On Tue, 2005-11-22 at 15:49 +1100, Benjamin Herrenschmidt wrote:
> This moves the discovery of legacy serial ports to a separate file,
> makes it common to ppc32 and ppc64, and reworks it to use the new OF
> address translators to get to the ports early. This new version can also
> detect some PCI serial cards using legacy chips and will probably match
> those discovered port with the default console choice.
This makes it deal with the fact that the Pegasos firmware reports that
its clock frequency is zero...
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/legacy_serial.c')
| -rw-r--r-- | arch/powerpc/kernel/legacy_serial.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index 28ad50e424a9..7a685cae81ed 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c @@ -43,7 +43,10 @@ static int __init add_legacy_port(struct device_node *np, int want_index, /* get clock freq. if present */ clk = (u32 *)get_property(np, "clock-frequency", NULL); - clock = clk ? *clk : BASE_BAUD * 16; + if (clk && *clk) + clock = *clk; + else + clock = BASE_BAUD * 16; /* get default speed if present */ spd = (u32 *)get_property(np, "current-speed", NULL); |