[PATCH] input: i8042 - add PNP modaliases

From: Tom Gundersen
Date: Wed Sep 04 2013 - 05:26:46 EST


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@xxxxxxxxxxxxx>
Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Signed-off-by: Tom Gundersen <teg@xxxxxxx>
---

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/