diff options
| author | Alan Curry <pacman@theworld.com> | 2007-07-25 11:28:32 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-26 16:17:45 +1000 |
| commit | f5d834fc34e61f1a40435981062000e5d2b2baa8 (patch) | |
| tree | 3ed0b4a2ba4870b733e66483b01d69903142aa59 /arch/powerpc/kernel | |
| parent | 16782a604c458e1edcefca52457a82395b788bed (diff) | |
| download | blackbird-op-linux-f5d834fc34e61f1a40435981062000e5d2b2baa8.tar.gz blackbird-op-linux-f5d834fc34e61f1a40435981062000e5d2b2baa8.zip | |
[POWERPC] Fix Pegasos keyboard detection
As of 2.6.22 the kernel doesn't recognize the i8042 keyboard/mouse
controller on the PegasosPPC. This is because of a feature/bug in the
OF device tree: the "device_type" attribute is an empty string instead
of "8042" as the kernel expects. This adds a secondary detection
which looks for a device whose *name* is "8042" if there is no device
whose *type* is "8042".
Signed-off-by: Alan Curry <pacman@world.std.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 4924c48cb1ff..50ef38cffdbf 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -496,6 +496,10 @@ int check_legacy_ioport(unsigned long base_port) break; } np = of_find_node_by_type(NULL, "8042"); + /* Pegasos has no device_type on its 8042 node, look for the + * name instead */ + if (!np) + np = of_find_node_by_name(NULL, "8042"); break; case FDC_BASE: /* FDC1 */ np = of_find_node_by_type(NULL, "fdc"); |
