2 files changed, 18 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 5e4d852f640c..8b6ada66060b 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -94,6 +94,10 @@ struct screen_info screen_info = {
         .orig_video_points = 16
 };
 
+/* Variables required to store legacy IO irq routing */
+int of_i8042_kbd_irq;
+int of_i8042_aux_irq;
+
 #ifdef __DO_IRQ_CANON
 /* XXX should go elsewhere eventually */
 int ppc_do_canonicalize_irqs;
@@ -575,6 +579,15 @@ int check_legacy_ioport(unsigned long base_port)
                         np = of_find_compatible_node(NULL, NULL, "pnpPNP,f03");
                 if (np) {
                         parent = of_get_parent(np);
+
+                        of_i8042_kbd_irq = irq_of_parse_and_map(parent, 0);
+                        if (!of_i8042_kbd_irq)
+                                of_i8042_kbd_irq = 1;
+
+                        of_i8042_aux_irq = irq_of_parse_and_map(parent, 1);
+                        if (!of_i8042_aux_irq)
+                                of_i8042_aux_irq = 12;
+
                         of_node_put(np);
                         np = parent;
                         break;
diff --git a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
index 847f4aad7ed5..5d48bb66aa73 100644
--- a/drivers/input/serio/i8042-io.h
+++ b/drivers/input/serio/i8042-io.h
@@ -27,6 +27,11 @@
 #include <asm/irq.h>
 #elif defined(CONFIG_SH_CAYMAN)
 #include <asm/irq.h>
+#elif defined(CONFIG_PPC)
+extern int of_i8042_kbd_irq;
+extern int of_i8042_aux_irq;
+# define I8042_KBD_IRQ  of_i8042_kbd_irq
+# define I8042_AUX_IRQ  of_i8042_aux_irq
 #else
 # define I8042_KBD_IRQ  1
 # define I8042_AUX_IRQ  12