diff options
| author | Andy Lutomirski <luto@MIT.EDU> | 2011-05-24 15:16:43 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-08-05 14:45:41 -0400 |
| commit | 33009557bd9397c446a59e4cc91059a8e84c046b (patch) | |
| tree | b553cf2d802bda2170ae8da013a1dbe3a79e2d36 | |
| parent | 38803141bf6ccf8f20d05c6f48e6e12c3650ce9a (diff) | |
| download | kernel_samsung_smdk4412-33009557bd9397c446a59e4cc91059a8e84c046b.zip kernel_samsung_smdk4412-33009557bd9397c446a59e4cc91059a8e84c046b.tar.gz kernel_samsung_smdk4412-33009557bd9397c446a59e4cc91059a8e84c046b.tar.bz2 | |
Add KEY_MICMUTE and enable it on Lenovo X220
I suspect that this works on T410.
Signed-off-by: Andy Lutomirski <luto@mit.edu>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 11 | ||||
| -rw-r--r-- | include/linux/input.h | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 26c5b11..7bd829f 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -3186,8 +3186,17 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) KEY_VENDOR, /* 0x17: Thinkpad/AccessIBM/Lenovo */ /* (assignments unknown, please report if found) */ + KEY_UNKNOWN, KEY_UNKNOWN, + + /* + * The mic mute button only sends 0x1a. It does not + * automatically mute the mic or change the mute light. + */ + KEY_MICMUTE, /* 0x1a: Mic mute (since ?400 or so) */ + + /* (assignments unknown, please report if found) */ KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, - KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, KEY_UNKNOWN, + KEY_UNKNOWN, }, }; diff --git a/include/linux/input.h b/include/linux/input.h index 068784e..a637e78 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -438,6 +438,8 @@ struct input_keymap_entry { #define KEY_WIMAX 246 #define KEY_RFKILL 247 /* Key that controls all radios */ +#define KEY_MICMUTE 248 /* Mute / unmute the microphone */ + /* Code 255 is reserved for special needs of AT keyboard driver */ #define BTN_MISC 0x100 |