From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 6 Mar 2022 10:06:42 +0000 (+0100)
Subject: 4.9-stable patches
X-Git-Tag: v4.9.305~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2a8bd28789947e38e9dac06f1c26a6e94c2afb9;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	hid-add-mapping-for-key_all_applications.patch
---

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
index 00000000000..04111f40fae
--- /dev/null
+++ b/queue-4.9/hid-add-mapping-for-key_all_applications.patch
@@ -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
diff --git a/queue-4.9/series b/queue-4.9/series
index 6b216b4d94a..02009dbeebf 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -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