Commit f5d834fc authored by Alan Curry's avatar Alan Curry Committed by Paul Mackerras

[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: default avatarAlan Curry <pacman@world.std.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 16782a60
...@@ -496,6 +496,10 @@ int check_legacy_ioport(unsigned long base_port) ...@@ -496,6 +496,10 @@ int check_legacy_ioport(unsigned long base_port)
break; break;
} }
np = of_find_node_by_type(NULL, "8042"); 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; break;
case FDC_BASE: /* FDC1 */ case FDC_BASE: /* FDC1 */
np = of_find_node_by_type(NULL, "fdc"); np = of_find_node_by_type(NULL, "fdc");
......
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