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 ...
Showing the changes to include/linux (3 of 27 files). Show all
Unified · Split
| @@ -788,4 +788,16 @@ struct tee_client_device_id { · 787 unmodified lines | ||
| 788 | 788 | uuid_t uuid; |
| 789 | 789 | }; |
| 790 | 790 | |
| 791 | +/* WMI */ | |
| 792 | + | |
| 793 | +#define WMI_MODULE_PREFIX "wmi:" | |
| 794 | + | |
| 795 | +/** | |
| 796 | + * struct wmi_device_id - WMI device identifier | |
| 797 | + * @guid_string: 36 char string of the form fa50ff2b-f2e8-45de-83fa-65417f2f49ba | |
| 798 | + */ | |
| 799 | +struct wmi_device_id { | |
| 800 | + const char guid_string[UUID_STRING_LEN+1]; | |
| 801 | +}; | |
| 802 | + | |
| 791 | 803 | #endif /* LINUX_MOD_DEVICETABLE_H */ |
| @@ -61,6 +61,7 @@ struct mlxreg_hotplug_device { · 60 unmodified lines | ||
| 61 | 61 | * @reg: attribute register; |
| 62 | 62 | * @mask: attribute access mask; |
| 63 | 63 | * @bit: attribute effective bit; |
| 64 | + * @capability: attribute capability register; | |
| 64 | 65 | * @mode: access mode; |
| 65 | 66 | * @np - pointer to node platform associated with attribute; |
| 66 | 67 | * @hpdev - hotplug device data; |
| @@ -72,6 +73,7 @@ struct mlxreg_core_data { · 5 unmodified lines | ||
| 72 | 73 | u32 reg; |
| 73 | 74 | u32 mask; |
| 74 | 75 | u32 bit; |
| 76 | + u32 capability; | |
| 75 | 77 | umode_t mode; |
| 76 | 78 | struct device_node *np; |
| 77 | 79 | struct mlxreg_hotplug_device hpdev; |
| @@ -107,9 +109,9 @@ struct mlxreg_core_item { · 29 unmodified lines | ||
| 107 | 109 | /** |
| 108 | 110 | * struct mlxreg_core_platform_data - platform data: |
| 109 | 111 | * |
| 110 | − * @led_data: led private data; | |
| 112 | + * @data: instance private data; | |
| 111 | 113 | * @regmap: register map of parent device; |
| 112 | − * @counter: number of led instances; | |
| 114 | + * @counter: number of instances; | |
| 113 | 115 | */ |
| 114 | 116 | struct mlxreg_core_platform_data { |
| 115 | 117 | struct mlxreg_core_data *data; |
| @@ -18,6 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | |
| 19 | 19 | #include <linux/device.h> |
| 20 | 20 | #include <linux/acpi.h> |
| 21 | +#include <linux/mod_devicetable.h> | |
| 21 | 22 | #include <uapi/linux/wmi.h> |
| 22 | 23 | |
| 23 | 24 | struct wmi_device { |
| @@ -39,10 +40,6 @@ extern union acpi_object *wmidev_block_query(struct wmi_device *wdev, · 15 unmodified lines | ||
| 39 | 40 | |
| 40 | 41 | extern int set_required_buffer_size(struct wmi_device *wdev, u64 length); |
| 41 | 42 | |
| 42 | −struct wmi_device_id { | |
| 43 | − const char *guid_string; | |
| 44 | −}; | |
| 45 | − | |
| 46 | 43 | struct wmi_driver { |
| 47 | 44 | struct device_driver driver; |
| 48 | 45 | const struct wmi_device_id *id_table; |