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/i2c-multi-instantiate.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/i2c-multi-instantiate.c')
-rw-r--r-- | drivers/platform/x86/i2c-multi-instantiate.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c index 3d893e0ac250..197d8a192721 100644 --- a/drivers/platform/x86/i2c-multi-instantiate.c +++ b/drivers/platform/x86/i2c-multi-instantiate.c | |||
@@ -159,6 +159,14 @@ static const struct i2c_inst_data bsg1160_data[] = { | |||
159 | {} | 159 | {} |
160 | }; | 160 | }; |
161 | 161 | ||
162 | static const struct i2c_inst_data bsg2150_data[] = { | ||
163 | { "bmc150_accel", IRQ_RESOURCE_GPIO, 0 }, | ||
164 | { "bmc150_magn" }, | ||
165 | /* The resources describe a 3th client, but it is not really there. */ | ||
166 | { "bsg2150_dummy_dev" }, | ||
167 | {} | ||
168 | }; | ||
169 | |||
162 | static const struct i2c_inst_data int3515_data[] = { | 170 | static const struct i2c_inst_data int3515_data[] = { |
163 | { "tps6598x", IRQ_RESOURCE_APIC, 0 }, | 171 | { "tps6598x", IRQ_RESOURCE_APIC, 0 }, |
164 | { "tps6598x", IRQ_RESOURCE_APIC, 1 }, | 172 | { "tps6598x", IRQ_RESOURCE_APIC, 1 }, |
@@ -173,6 +181,7 @@ static const struct i2c_inst_data int3515_data[] = { | |||
173 | */ | 181 | */ |
174 | static const struct acpi_device_id i2c_multi_inst_acpi_ids[] = { | 182 | static const struct acpi_device_id i2c_multi_inst_acpi_ids[] = { |
175 | { "BSG1160", (unsigned long)bsg1160_data }, | 183 | { "BSG1160", (unsigned long)bsg1160_data }, |
184 | { "BSG2150", (unsigned long)bsg2150_data }, | ||
176 | { "INT3515", (unsigned long)int3515_data }, | 185 | { "INT3515", (unsigned long)int3515_data }, |
177 | { } | 186 | { } |
178 | }; | 187 | }; |