[POWERPC] Add a check for keyboard/mouse device nodes in check_legacy_ioport()
authorWade Farnsworth <wfarnsworth@mvista.com>
Wed, 20 Jun 2007 00:15:10 +0000 (10:15 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 10 Jul 2007 11:53:49 +0000 (21:53 +1000)
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>
arch/powerpc/kernel/setup-common.c

index ed07a198f8d665a9b9b90461cb48d464f57abd16..38c4b733a72e53104079f4370b6301b6ac7f4e28 100644 (file)
@@ -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 */