diff options
| author | Martyn Welch <martyn.welch@ge.com> | 2010-05-24 18:09:16 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-08 21:28:33 -0400 |
| commit | 540c6c392f01887dcc96bef0a41e63e6c1334f01 (patch) | |
| tree | 7ee14b42b10f4be641c8a1fcd5bb8aa8d8ee09e4 /drivers/input/serio | |
| parent | 68581e9350506dcf0160c3a29dcd21e5a848cda7 (diff) | |
powerpc: Add i8042 keyboard and mouse irq parsing
Currently the irqs for the i8042, which historically provides keyboard and
mouse (aux) support, is hardwired in the driver rather than parsing the
dts. This patch modifies the powerpc legacy IO code to attempt to parse
the device tree for this information, failing back to the hardcoded values
if it fails.
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/i8042-io.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ | |||
| 27 | #include <asm/irq.h> | 27 | #include <asm/irq.h> |
| 28 | #elif defined(CONFIG_SH_CAYMAN) | 28 | #elif defined(CONFIG_SH_CAYMAN) |
| 29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
| 30 | #elif defined(CONFIG_PPC) | ||
| 31 | extern int of_i8042_kbd_irq; | ||
| 32 | extern int of_i8042_aux_irq; | ||
| 33 | # define I8042_KBD_IRQ of_i8042_kbd_irq | ||
| 34 | # define I8042_AUX_IRQ of_i8042_aux_irq | ||
| 30 | #else | 35 | #else |
| 31 | # define I8042_KBD_IRQ 1 | 36 | # define I8042_KBD_IRQ 1 |
| 32 | # define I8042_AUX_IRQ 12 | 37 | # define I8042_AUX_IRQ 12 |