History

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 ...

Linus Torvalds committed 7 years ago

Commit dbbdf542 parents 45ba8d5 9c22cc027 files · +541 −100Browse files

Showing the changes to include/linux (3 of 27 files). Show all

Unified · Split

3 files
  1. include/linux/mod_devicetable.h +12 −0
  2. include/linux/platform_data/mlxreg.h +4 −2
  3. include/linux/wmi.h +1 −4
include/linux/mod_devicetable.h+12−0
@@ -788,4 +788,16 @@ struct tee_client_device_id { · 787 unmodified lines
788788 uuid_t uuid;
789789 };
790790
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+
791803 #endif /* LINUX_MOD_DEVICETABLE_H */
include/linux/platform_data/mlxreg.h+4−2
@@ -61,6 +61,7 @@ struct mlxreg_hotplug_device { · 60 unmodified lines
6161 * @reg: attribute register;
6262 * @mask: attribute access mask;
6363 * @bit: attribute effective bit;
64+ * @capability: attribute capability register;
6465 * @mode: access mode;
6566 * @np - pointer to node platform associated with attribute;
6667 * @hpdev - hotplug device data;
@@ -72,6 +73,7 @@ struct mlxreg_core_data { · 5 unmodified lines
7273 u32 reg;
7374 u32 mask;
7475 u32 bit;
76+ u32 capability;
7577 umode_t mode;
7678 struct device_node *np;
7779 struct mlxreg_hotplug_device hpdev;
@@ -107,9 +109,9 @@ struct mlxreg_core_item { · 29 unmodified lines
107109 /**
108110 * struct mlxreg_core_platform_data - platform data:
109111 *
110− * @led_data: led private data;
112+ * @data: instance private data;
111113 * @regmap: register map of parent device;
112− * @counter: number of led instances;
114+ * @counter: number of instances;
113115 */
114116 struct mlxreg_core_platform_data {
115117 struct mlxreg_core_data *data;
include/linux/wmi.h+1−4
@@ -18,6 +18,7 @@ · 17 unmodified lines
1818
1919 #include <linux/device.h>
2020 #include <linux/acpi.h>
21+#include <linux/mod_devicetable.h>
2122 #include <uapi/linux/wmi.h>
2223
2324 struct wmi_device {
@@ -39,10 +40,6 @@ extern union acpi_object *wmidev_block_query(struct wmi_device *wdev, · 15 unmodified lines
3940
4041 extern int set_required_buffer_size(struct wmi_device *wdev, u64 length);
4142
42−struct wmi_device_id {
43− const char *guid_string;
44−};
45−
4643 struct wmi_driver {
4744 struct device_driver driver;
4845 const struct wmi_device_id *id_table;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t