Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=db0dbae9d9680bce69fe1ce775709e60c8ee9c29
Commit:     db0dbae9d9680bce69fe1ce775709e60c8ee9c29
Parent:     6a281856c02d2291df2f7d9df5bfdee2e7bdd747
Author:     Wade Farnsworth <[EMAIL PROTECTED]>
AuthorDate: Wed Jun 20 10:15:10 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 21:53:49 2007 +1000

    [POWERPC] Add a check for keyboard/mouse device nodes in 
check_legacy_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 <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/kernel/setup-common.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/setup-common.c 
b/arch/powerpc/kernel/setup-common.c
index ed07a19..38c4b73 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to