Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bc413c9563db6d596e841b2756ed3fccc48de5c0
Commit: bc413c9563db6d596e841b2756ed3fccc48de5c0
Parent: 243db53bbd8503065b21fd6e8265387048eb569b
Author: Eric Piel <[EMAIL PROTECTED]>
AuthorDate: Wed Mar 7 01:45:16 2007 -0500
Committer: Dmitry Torokhov <[EMAIL PROTECTED]>
CommitDate: Wed Mar 7 01:45:16 2007 -0500
Input: wistron - add support for TravelMate 610
Add support for Acer TravelMate 610 to wistron_btns. All special keys
are detected, but the 2 leds are not handled (yet).
Signed-off-by: Eric Piel <[EMAIL PROTECTED]>
Signed-off-by: Dmitry Torokhov <[EMAIL PROTECTED]>
---
drivers/input/misc/wistron_btns.c | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/drivers/input/misc/wistron_btns.c
b/drivers/input/misc/wistron_btns.c
index e1183ae..39e4375 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -324,6 +324,21 @@ static struct key_entry keymap_acer_travelmate_240[] = {
{ KE_END, 0 }
};
+/* Wifi subsystem only activates the led. Therefore we need to pass
+ * wifi event as a normal key, then userspace can really change the wifi state.
+ * TODO we need to export led state to userspace (wifi and mail) */
+static struct key_entry keymap_acer_travelmate_610[] = {
+ { KE_KEY, 0x01, KEY_HELP },
+ { KE_KEY, 0x02, KEY_CONFIG },
+ { KE_KEY, 0x11, KEY_PROG1 },
+ { KE_KEY, 0x12, KEY_PROG2 },
+ { KE_KEY, 0x13, KEY_PROG3 },
+ { KE_KEY, 0x14, KEY_MAIL },
+ { KE_KEY, 0x15, KEY_WWW },
+ { KE_KEY, 0x40, KEY_WLAN }, /* Wifi */
+ { KE_END, 0 }
+};
+
static struct key_entry keymap_aopen_1559as[] = {
{ KE_KEY, 0x01, KEY_HELP },
{ KE_KEY, 0x06, KEY_PROG3 },
@@ -408,6 +423,15 @@ static struct dmi_system_id dmi_ids[] __initdata = {
},
{
.callback = dmi_matched,
+ .ident = "Acer TravelMate 610",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "ACER"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 610"),
+ },
+ .driver_data = keymap_acer_travelmate_610
+ },
+ {
+ .callback = dmi_matched,
.ident = "AOpen 1559AS",
.matches = {
DMI_MATCH(DMI_PRODUCT_NAME, "E2U"),
-
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
