From e8129d69bd4e09eab591bfb15633bd75505a83ba Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 3 Jun 2014 09:42:12 -0400 Subject: [PATCH] Add F9-F12 hotkeys on various thinkpads From: Hans de Goede --- kernel.spec | 6 +++ ...d-mappings-for-F9-F12-hotkeys-on-X24.patch | 45 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch diff --git a/kernel.spec b/kernel.spec index 73886971c..abbf505da 100644 --- a/kernel.spec +++ b/kernel.spec @@ -643,6 +643,9 @@ Patch25093: auditsc-audit_krule-mask-accesses-need-bounds-checking.patch Patch26000: perf-lib64.patch +# Patch series from Hans for various backlight and platform driver fixes +Patch26001: thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch + # END OF PATCH DEFINITIONS %endif @@ -1362,6 +1365,9 @@ ApplyPatch auditsc-audit_krule-mask-accesses-need-bounds-checking.patch ApplyPatch perf-lib64.patch +# Patch series from Hans for various backlight and platform driver fixes +ApplyPatch thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch + # END OF PATCH APPLICATIONS %endif diff --git a/thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch b/thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch new file mode 100644 index 000000000..9f82b7d66 --- /dev/null +++ b/thinkpad_acpi-Add-mappings-for-F9-F12-hotkeys-on-X24.patch @@ -0,0 +1,45 @@ +Bugzilla: N/A +Upstream-status: Sent for 3.16 + +From a02f11f85e2cb2e0aced78913ebcf060d6055203 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 2 Jun 2014 17:40:58 +0200 +Subject: [PATCH 01/14] thinkpad_acpi: Add mappings for F9 - F12 hotkeys on + X240 / T440 / T540 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The T440s user guide says that when Fn-lock is not active, the *40s' F9 - F12 +keys should be mapped to: control-panel, search, show-all-windows and Computer. + +These keys generate the sofar unused 28 - 31 hotkey scancodes. + +For the first 2 this nicely matches the icons on the keys, for the latter 2 +the icons are somewhat creative, which is why I ended up looking them up in +the user manual. + +Signed-off-by: Hans de Goede +--- + drivers/platform/x86/thinkpad_acpi.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c +index 15e61c16736e..d82f196e3cfe 100644 +--- a/drivers/platform/x86/thinkpad_acpi.c ++++ b/drivers/platform/x86/thinkpad_acpi.c +@@ -3171,8 +3171,10 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) + 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, ++ ++ /* Extra keys in use since the X240 / T440 / T540 */ ++ KEY_CONFIG, KEY_SEARCH, KEY_SCALE, KEY_COMPUTER, + }, + }; + +-- +1.9.0 +