]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.9-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 6 Mar 2022 10:06:42 +0000 (11:06 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 6 Mar 2022 10:06:42 +0000 (11:06 +0100)
added patches:
hid-add-mapping-for-key_all_applications.patch

queue-4.9/hid-add-mapping-for-key_all_applications.patch [new file with mode: 0644]
queue-4.9/series

diff --git a/queue-4.9/hid-add-mapping-for-key_all_applications.patch b/queue-4.9/hid-add-mapping-for-key_all_applications.patch
new file mode 100644 (file)
index 0000000..04111f4
--- /dev/null
@@ -0,0 +1,61 @@
+From 327b89f0acc4c20a06ed59e4d9af7f6d804dc2e2 Mon Sep 17 00:00:00 2001
+From: William Mahon <wmahon@chromium.org>
+Date: Thu, 3 Mar 2022 18:26:22 -0800
+Subject: HID: add mapping for KEY_ALL_APPLICATIONS
+
+From: William Mahon <wmahon@chromium.org>
+
+commit 327b89f0acc4c20a06ed59e4d9af7f6d804dc2e2 upstream.
+
+This patch adds a new key definition for KEY_ALL_APPLICATIONS
+and aliases KEY_DASHBOARD to it.
+
+It also maps the 0x0c/0x2a2 usage code to KEY_ALL_APPLICATIONS.
+
+Signed-off-by: William Mahon <wmahon@chromium.org>
+Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Link: https://lore.kernel.org/r/20220303035618.1.I3a7746ad05d270161a18334ae06e3b6db1a1d339@changeid
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/hid/hid-debug.c                |    4 +++-
+ drivers/hid/hid-input.c                |    2 ++
+ include/uapi/linux/input-event-codes.h |    3 ++-
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+--- a/drivers/hid/hid-debug.c
++++ b/drivers/hid/hid-debug.c
+@@ -833,7 +833,9 @@ static const char *keys[KEY_MAX + 1] = {
+       [KEY_F22] = "F22",                      [KEY_F23] = "F23",
+       [KEY_F24] = "F24",                      [KEY_PLAYCD] = "PlayCD",
+       [KEY_PAUSECD] = "PauseCD",              [KEY_PROG3] = "Prog3",
+-      [KEY_PROG4] = "Prog4",                  [KEY_SUSPEND] = "Suspend",
++      [KEY_PROG4] = "Prog4",
++      [KEY_ALL_APPLICATIONS] = "AllApplications",
++      [KEY_SUSPEND] = "Suspend",
+       [KEY_CLOSE] = "Close",                  [KEY_PLAY] = "Play",
+       [KEY_FASTFORWARD] = "FastForward",      [KEY_BASSBOOST] = "BassBoost",
+       [KEY_PRINT] = "Print",                  [KEY_HP] = "HP",
+--- a/drivers/hid/hid-input.c
++++ b/drivers/hid/hid-input.c
+@@ -937,6 +937,8 @@ static void hidinput_configure_usage(str
+               case 0x28b: map_key_clear(KEY_FORWARDMAIL);     break;
+               case 0x28c: map_key_clear(KEY_SEND);            break;
++              case 0x2a2: map_key_clear(KEY_ALL_APPLICATIONS);        break;
++
+               case 0x2c7: map_key_clear(KEY_KBDINPUTASSIST_PREV);             break;
+               case 0x2c8: map_key_clear(KEY_KBDINPUTASSIST_NEXT);             break;
+               case 0x2c9: map_key_clear(KEY_KBDINPUTASSIST_PREVGROUP);                break;
+--- a/include/uapi/linux/input-event-codes.h
++++ b/include/uapi/linux/input-event-codes.h
+@@ -277,7 +277,8 @@
+ #define KEY_PAUSECD           201
+ #define KEY_PROG3             202
+ #define KEY_PROG4             203
+-#define KEY_DASHBOARD         204     /* AL Dashboard */
++#define KEY_ALL_APPLICATIONS  204     /* AC Desktop Show All Applications */
++#define KEY_DASHBOARD         KEY_ALL_APPLICATIONS
+ #define KEY_SUSPEND           205
+ #define KEY_CLOSE             206     /* AC Close */
+ #define KEY_PLAY              207
index 6b216b4d94a60c69b1b66e370cb57d5d8ee085b7..02009dbeebffaf595840182030cfe5749c301467 100644 (file)
@@ -27,3 +27,4 @@ soc-fsl-qe-check-of-ioremap-return-value.patch
 net-chelsio-cxgb3-check-the-return-value-of-pci_find.patch
 input-elan_i2c-move-regulator_able-out-of-elan_able_power.patch
 input-elan_i2c-fix-regulator-enable-count-imbalance-after-suspend-resume.patch
+hid-add-mapping-for-key_all_applications.patch