[PATCH] When checking I8042 io port, use of_find_compatible_node() instead of of_find_node_by_type()

Wade Farnsworth wfarnsworth at mvista.com
Thu Jun 7 02:42:25 EST 2007


In check_legacy_ioport(), instead of using of_find_node_by_type() to
find the 8042 node, use of_find_compatible_node() to find either the
keyboard or mouse node.

Signed-off-by: Wade Farnsworth <wfarnsworth at mvista.com>

---

 arch/powerpc/kernel/setup-common.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Index: linux-2.6-powerpc-8641/arch/powerpc/kernel/setup-common.c
===================================================================
--- linux-2.6-powerpc-8641.orig/arch/powerpc/kernel/setup-common.c
+++ linux-2.6-powerpc-8641/arch/powerpc/kernel/setup-common.c
@@ -517,7 +517,14 @@ int check_legacy_ioport(unsigned long ba
 
 	switch(base_port) {
 	case I8042_DATA_REG:
-		np = of_find_node_by_type(NULL, "8042");
+		np = of_find_compatible_node(NULL, NULL, "pnpPNP,303");
+		if (!np)
+			np = of_find_compatible_node(NULL, NULL, "pnpPNP,f03");
+		if (np) {
+			parent = of_get_parent(np);
+			of_node_put(np);
+			np = parent;
+		}
 		break;
 	case FDC_BASE: /* FDC1 */
 		np = of_find_node_by_type(NULL, "fdc");





More information about the Linuxppc-dev mailing list