summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAceLan Kao <acelan.kao@canonical.com>2012-07-04 15:20:14 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-02 10:30:23 -0700
commit4368ade3ff2bfff1033f9e5758630b3d4e8f7e71 (patch)
treee0714509fe43ea9225844dc4d9fe6304483d19b4
parent91a1da919e60a62ed3dfb10296e8eed4eb2b03bd (diff)
downloadlinux-3.10-4368ade3ff2bfff1033f9e5758630b3d4e8f7e71.tar.gz
linux-3.10-4368ade3ff2bfff1033f9e5758630b3d4e8f7e71.tar.bz2
linux-3.10-4368ade3ff2bfff1033f9e5758630b3d4e8f7e71.zip
asus-nb-wmi: add some video toggle keys
commit 3766054fff4af1b58a1440a284907887f4d2e8be upstream. There are some new video switch keys that used by newer machines. 0xA0 - SDSP HDMI only 0xA1 - SDSP LCD + HDMI 0xA2 - SDSP CRT + HDMI 0xA3 - SDSP TV + HDMI But in Linux, there is no suitable userspace application to handle this, so, mapping them all to KEY_SWITCHVIDEOMODE. Signed-off-by: AceLan Kao <acelan.kao@canonical.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> Cc: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/platform/x86/asus-nb-wmi.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
index 99a30b51313..6de14fd090a 100644
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -94,6 +94,10 @@ static const struct key_entry asus_nb_wmi_keymap[] = {
{ KE_KEY, 0x8A, { KEY_PROG1 } },
{ KE_KEY, 0x95, { KEY_MEDIA } },
{ KE_KEY, 0x99, { KEY_PHONE } },
+ { KE_KEY, 0xA0, { KEY_SWITCHVIDEOMODE } }, /* SDSP HDMI only */
+ { KE_KEY, 0xA1, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + HDMI */
+ { KE_KEY, 0xA2, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + HDMI */
+ { KE_KEY, 0xA3, { KEY_SWITCHVIDEOMODE } }, /* SDSP TV + HDMI */
{ KE_KEY, 0xb5, { KEY_CALC } },
{ KE_KEY, 0xc4, { KEY_KBDILLUMUP } },
{ KE_KEY, 0xc5, { KEY_KBDILLUMDOWN } },