diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-10 16:16:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-10 16:16:37 -0400 |
commit | dbbdf54c7206bf3f201f9ddaa5f4dd87835271cc (patch) | |
tree | 941dbf0dada73344acdfe891ec1d50a01316566d /drivers/platform/x86/dell-wmi.c | |
parent | 45ba8d5d061b13494c2a7a7652d51b9da3d9e77a (diff) | |
parent | 9c22cc020db637850ba47a14a598d09f706f19ad (diff) |
Merge tag 'platform-drivers-x86-v5.1-1' of git://git.infradead.org/linux-platform-drivers-x86
Pull x86 platform driver updates from Darren Hart:
- use MODULE_DEVICE_TABLE across several wmi drivers, keeping
wmi_device_id and MODULE_ALIAS() declarations in sync
- add several Ideapad models to the no_hw_rfkill list
- add support for new Mellanox platforms, including new fan and LED
functionality
- address Dell keyboard backlight change event and power button release
issues
- update dell_rbu to use appropriate memory allocation mechanisms
- several small fixes and Ice Lake support for intel_pmc_core
- fix a suspend regression for Cherry Trail based devices in
intel_int0002_vgpio
- a few other routine fixes
* tag 'platform-drivers-x86-v5.1-1' of git://git.infradead.org/linux-platform-drivers-x86: (50 commits)
MAINTAINERS: Include mlxreg.h in Mellanox Platform Driver files
platform/x86: ideapad-laptop: Add S130-14IGM to no_hw_rfkill list
platform/x86: mlx-platform: Fix access mode for fan_dir attribute
platform/x86: mlx-platform: Add UID LED for the next generation systems
platform/x86: mlx-platform: Add extra CPLD for next generation systems
platform/x86: wmi-bmof: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()
platform/x86: intel-wmi-thunderbolt: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()
platform/x86: huawei-wmi: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()
platform/x86: dell-wmi: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()
platform/x86: dell-wmi-descriptor: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()
platform/x86: dell-smbios-wmi: use MODULE_DEVICE_TABLE() instead of MODULE_ALIAS()
platform/x86: wmi: add WMI support to MODULE_DEVICE_TABLE()
platform/x86: wmi: move struct wmi_device_id to mod_devicetable.h
modpost: file2alias: define size of alias
platform/x86: touchscreen_dmi: Add info for the CHUWI Hi10 Air tablet
platform/x86: ideapad-laptop: Add Ideapad 530S-14ARR to no_hw_rfkill list
platform/x86: ideapad-laptop: Add Yoga C930 to no_hw_rfkill_list
platform/x86: intel_pmc_core: Quirk to ignore XTAL shutdown
platform/x86: intel_pmc_core: Add Package cstates residency info
platform/x86: intel_pmc_core: Add ICL platform support
...
Diffstat (limited to 'drivers/platform/x86/dell-wmi.c')
-rw-r--r-- | drivers/platform/x86/dell-wmi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index 16c7f3d9a335..d118bb73fcae 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c | |||
@@ -50,8 +50,6 @@ MODULE_LICENSE("GPL"); | |||
50 | 50 | ||
51 | static bool wmi_requires_smbios_request; | 51 | static bool wmi_requires_smbios_request; |
52 | 52 | ||
53 | MODULE_ALIAS("wmi:"DELL_EVENT_GUID); | ||
54 | |||
55 | struct dell_wmi_priv { | 53 | struct dell_wmi_priv { |
56 | struct input_dev *input_dev; | 54 | struct input_dev *input_dev; |
57 | u32 interface_version; | 55 | u32 interface_version; |
@@ -267,6 +265,9 @@ static const struct key_entry dell_wmi_keymap_type_0010[] = { | |||
267 | /* Fn-lock switched to multimedia keys */ | 265 | /* Fn-lock switched to multimedia keys */ |
268 | { KE_IGNORE, 0x1, { KEY_RESERVED } }, | 266 | { KE_IGNORE, 0x1, { KEY_RESERVED } }, |
269 | 267 | ||
268 | /* Keyboard backlight change notification */ | ||
269 | { KE_IGNORE, 0x3f, { KEY_RESERVED } }, | ||
270 | |||
270 | /* Mic mute */ | 271 | /* Mic mute */ |
271 | { KE_KEY, 0x150, { KEY_MICMUTE } }, | 272 | { KE_KEY, 0x150, { KEY_MICMUTE } }, |
272 | 273 | ||
@@ -738,3 +739,5 @@ static void __exit dell_wmi_exit(void) | |||
738 | wmi_driver_unregister(&dell_wmi_driver); | 739 | wmi_driver_unregister(&dell_wmi_driver); |
739 | } | 740 | } |
740 | module_exit(dell_wmi_exit); | 741 | module_exit(dell_wmi_exit); |
742 | |||
743 | MODULE_DEVICE_TABLE(wmi, dell_wmi_id_table); | ||