Skip to content

Commit

Permalink
[POWERPC] Add a check for keyboard/mouse device nodes in check_legacy…
Browse files Browse the repository at this point in the history
…_ioport()

The device tree for the MPC8641 HPCN does not implement the device type
property for I8042 nodes.

In addition to checking the I8042 node's device type, also match the
keyboard and/or mouse nodes' compatible property.

Signed-off-by: Wade Farnsworth <wfarnsworth@mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Wade Farnsworth authored and Paul Mackerras committed Jul 10, 2007
1 parent 6a28185 commit db0dbae
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions arch/powerpc/kernel/setup-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,14 @@ int check_legacy_ioport(unsigned long base_port)

switch(base_port) {
case I8042_DATA_REG:
if (!(np = of_find_compatible_node(NULL, NULL, "pnpPNP,303")))
np = of_find_compatible_node(NULL, NULL, "pnpPNP,f03");
if (np) {
parent = of_get_parent(np);
of_node_put(np);
np = parent;
break;
}
np = of_find_node_by_type(NULL, "8042");
break;
case FDC_BASE: /* FDC1 */
Expand Down

0 comments on commit db0dbae

Please sign in to comment.