Thread (12 messages) 12 messages, 5 authors, 2013-10-31

[PATCH] input: i8042 - add PNP modaliases

STALE4721d

From: Tom Gundersen <hidden>
Date: 2013-09-04 09:26:40
Also in: lkml
Subsystem: input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers: Dmitry Torokhov, Linus Torvalds

This allows the module to be autoloaded in the common case.

In order to work on non-PnP systems the module should be compiled in or loaded
unconditionally at boot (c.f. modules-load.d(5)), as before.

Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Tom Gundersen <redacted>
---

This appears to work for me (though I don't have the real hardware to test), I get the following aliases:
alias:          acpi*:CPQA0D7:*
alias:          pnp:dCPQA0D7*
alias:          acpi*:PNP0345:*
alias:          pnp:dPNP0345*
alias:          acpi*:PNP0344:*
alias:          pnp:dPNP0344*
alias:          acpi*:PNP0343:*
alias:          pnp:dPNP0343*
alias:          acpi*:PNP0320:*
alias:          pnp:dPNP0320*
alias:          acpi*:PNP030B:*
alias:          pnp:dPNP030b*
alias:          acpi*:PNP030A:*
alias:          pnp:dPNP030a*
alias:          acpi*:PNP0309:*
alias:          pnp:dPNP0309*
alias:          acpi*:PNP0306:*
alias:          pnp:dPNP0306*
alias:          acpi*:PNP0305:*
alias:          pnp:dPNP0305*
alias:          acpi*:PNP0304:*
alias:          pnp:dPNP0304*
alias:          acpi*:PNP0303:*
alias:          pnp:dPNP0303*
alias:          acpi*:PNP0302:*
alias:          pnp:dPNP0302*
alias:          acpi*:PNP0301:*
alias:          pnp:dPNP0301*
alias:          acpi*:PNP0300:*
alias:          pnp:dPNP0300*

 drivers/input/serio/i8042-x86ia64io.h | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 5f306f7..0ec9abb 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -765,6 +765,7 @@ static struct pnp_device_id pnp_kbd_devids[] = {
 	{ .id = "CPQA0D7", .driver_data = 0 },
 	{ .id = "", },
 };
+MODULE_DEVICE_TABLE(pnp, pnp_kbd_devids);
 
 static struct pnp_driver i8042_pnp_kbd_driver = {
 	.name           = "i8042 kbd",
@@ -786,6 +787,7 @@ static struct pnp_device_id pnp_aux_devids[] = {
 	{ .id = "SYN0801", .driver_data = 0 },
 	{ .id = "", },
 };
+MODULE_DEVICE_TABLE(pnp, pnp_aux_devids);
 
 static struct pnp_driver i8042_pnp_aux_driver = {
 	.name           = "i8042 aux",
-- 
1.8.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help