diff options
| author |   Michał Kępień <kernel@kempniu.pl> | 2016-03-04 14:09:10 +0100 |
|---|---|---|
| committer |   Darren Hart <dvhart@linux.intel.com> | 2016-03-23 10:05:51 -0700 |
| commit | aaf3a5e77566ad186a85d28a0afd26b8dd0afd11 (patch) | |
| tree | 45996a24fcf4b2efbe39ec284c2e88a251e47311 /drivers | |
| parent | dell-wmi: properly process Dell Instant Launch hotkey (diff) | |
| download | linux-dev-aaf3a5e77566ad186a85d28a0afd26b8dd0afd11.tar.xz linux-dev-aaf3a5e77566ad186a85d28a0afd26b8dd0afd11.zip | |
dell-wmi: support Dell Inspiron M5110
Similarly to Dell Vostro V131, Dell Inspiron M5110 also requires an
SMBIOS request to be issued in order for WMI events to be generated and
does not raise an i8042 interrupt when the Dell Instant Launch hotkey is
pressed. However, the event code for that hotkey on this machine is
0xe029, so add it to the legacy keymap.
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Tested-by: Darek Stojaczyk <darek.stojaczyk@gmail.com>
Reviewed-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/x86/dell-wmi.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 3ea959ecd635..15c6f1191aec 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -62,6 +62,14 @@ static int __init dmi_matched(const struct dmi_system_id *dmi) static const struct dmi_system_id dell_wmi_smbios_list[] __initconst = { { .callback = dmi_matched, + .ident = "Dell Inspiron M5110", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron M5110"), + }, + }, + { + .callback = dmi_matched, .ident = "Dell Vostro V131", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), @@ -110,8 +118,11 @@ static const struct key_entry dell_wmi_legacy_keymap[] __initconst = { { KE_IGNORE, 0xe020, { KEY_MUTE } }, - /* Shortcut and audio panel keys */ + /* Dell Instant Launch key */ { KE_KEY, 0xe025, { KEY_PROG4 } }, + { KE_KEY, 0xe029, { KEY_PROG4 } }, + + /* Audio panel key */ { KE_IGNORE, 0xe026, { KEY_RESERVED } }, { KE_IGNORE, 0xe02e, { KEY_VOLUMEDOWN } }, |