patches for 3.18

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-3.18/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch b/queue-3.18/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch
new file mode 100644 (file)
index 0000000..ca8efa1
--- /dev/null
+++ b/queue-3.18/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch
@@ -0,0 +1,39 @@
+From 4edb753318a826fa32ba75bd45613404057b1177 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita@gmail.com>
+Date: Wed, 31 Oct 2018 17:21:28 -0700
+Subject: platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[ Upstream commit 71b12beaf12f21a53bfe100795d0797f1035b570 ]
+
+According to Asus firmware engineers, the meaning of these codes is only
+to notify the OS that the screen brightness has been turned on/off by
+the EC. This does not match the meaning of KEY_DISPLAYTOGGLE /
+KEY_DISPLAY_OFF, where userspace is expected to change the display
+brightness.
+
+Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com>
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/platform/x86/asus-nb-wmi.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
+index b46a3653e6ab..26a987cf2946 100644
+--- a/drivers/platform/x86/asus-nb-wmi.c
++++ b/drivers/platform/x86/asus-nb-wmi.c
+@@ -312,8 +312,6 @@ static const struct key_entry asus_nb_wmi_keymap[] = {
+       { KE_KEY, 0x30, { KEY_VOLUMEUP } },
+       { KE_KEY, 0x31, { KEY_VOLUMEDOWN } },
+       { KE_KEY, 0x32, { KEY_MUTE } },
+-      { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */
+-      { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */
+       { KE_KEY, 0x35, { KEY_SCREENLOCK } },
+       { KE_KEY, 0x40, { KEY_PREVIOUSSONG } },
+       { KE_KEY, 0x41, { KEY_NEXTSONG } },
+-- 
+2.19.1
+

diff --git a/queue-3.18/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch b/queue-3.18/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch
new file mode 100644 (file)
index 0000000..56367b1
--- /dev/null
+++ b/queue-3.18/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch
@@ -0,0 +1,44 @@
+From 9ac0e9447976e537fb41b92f1d82f58d42846d7e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita@gmail.com>
+Date: Wed, 31 Oct 2018 17:21:27 -0700
+Subject: platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[ Upstream commit b3f2f3799a972d3863d0fdc2ab6287aef6ca631f ]
+
+When the OS registers to handle events from the display off hotkey the
+EC will send a notification with 0x35 for every key press, independent
+of the backlight state.
+
+The behavior of this key on Windows, with the ATKACPI driver from Asus
+installed, is turning off the backlight of all connected displays with a
+fading effect, and any cursor input or key press turning the backlight
+back on. The key press or cursor input that wakes up the display is also
+passed through to the application under the cursor or under focus.
+
+The key that matches this behavior the closest is KEY_SCREENLOCK.
+
+Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com>
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/platform/x86/asus-nb-wmi.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
+index f13b5b95c00f..b46a3653e6ab 100644
+--- a/drivers/platform/x86/asus-nb-wmi.c
++++ b/drivers/platform/x86/asus-nb-wmi.c
+@@ -314,6 +314,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = {
+       { KE_KEY, 0x32, { KEY_MUTE } },
+       { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */
+       { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */
++      { KE_KEY, 0x35, { KEY_SCREENLOCK } },
+       { KE_KEY, 0x40, { KEY_PREVIOUSSONG } },
+       { KE_KEY, 0x41, { KEY_NEXTSONG } },
+       { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */
+-- 
+2.19.1
+

diff --git a/queue-3.18/series b/queue-3.18/series
index 9e4888f4d31d71f6679fa6ae594683440256839f..d17cf45b56a03d6c22410128c31b7097eb2eddb9 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -25,3 +25,5 @@ cifs-do-not-count-enodata-as-failure-for-query-directory.patch
 fs-dcache-fix-incorrect-nr_dentry_unused-accounting-in-shrink_dcache_sb.patch
 arm64-hyp-stub-forbid-kprobing-of-the-hyp-stub.patch
 gfs2-revert-fix-loop-in-gfs2_rbm_find.patch
+platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch
+platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch