diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 11:42:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 11:42:21 -0400 |
commit | eb7046e9bf466cebfcfbcdf640e41d9e3a80086c (patch) | |
tree | 7d998f56e306de4c1a78355f219e38b75cfe3866 /drivers/platform/x86/intel_cht_int33fe.c | |
parent | 5b7449810ae6d652629c550d3974c8453836d229 (diff) | |
parent | 3b692c55e58d06ba9b17c66784cab5a95ba5be9b (diff) |
Merge tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform-drivers-x86
Pull x86 platform driver updates from Darren Hart:
- Move the Dell dcdbas and dell_rbu drivers into platform/drivers/x86
as they are closely coupled with other drivers in this location.
- Improve _init* usage for acerhdf and fix some usage issues with
messages and module parameters.
- Simplify asus-wmi by calling ACPI/WMI methods directly, eliminating
workqueue overhead, eliminate double reporting of keyboard backlight.
- Fix wake from USB failure on Bay Trail devices (intel_int0002_vgpio).
- Notify intel_telemetry users when IPC1 device is not enabled.
- Update various drivers with new laptop model IDs.
- Update several intel drivers to use SPDX identifers and order headers
alphabetically.
* tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform-drivers-x86: (64 commits)
HID: asus: only support backlight when it's not driven by WMI
platform/x86: asus-wmi: export function for evaluating WMI methods
platform/x86: asus-wmi: Only notify kbd LED hw_change by fn-key pressed
platform/x86: wmi: declare device_type structure as constant
platform/x86: ideapad: Add Y530-15ICH to no_hw_rfkill
platform/x86: Add Intel AtomISP2 dummy / power-management driver
platform/x86: touchscreen_dmi: Add min-x and min-y settings for various models
platform/x86: touchscreen_dmi: Add info for the Onda V80 Plus v3 tablet
platform/x86: touchscreen_dmi: Add info for the Trekstor Primetab T13B tablet
platform/x86: intel_telemetry: Get rid of custom macro
platform/x86: intel_telemetry: report debugfs failure
MAINTAINERS: intel_telemetry: Update maintainers info
platform/x86: Add LG Gram laptop special features driver
platform/x86: asus-wmi: Simplify the keyboard brightness updating process
platform/x86: touchscreen_dmi: Add info for the Trekstor Primebook C11 convertible
platform/x86: mlx-platform: Properly use mlxplat_mlxcpld_msn201x_items
MAINTAINERS: intel_pmc_core: Update MAINTAINERS
firmware: dcdbas: include linux/io.h
platform/x86: intel-wmi-thunderbolt: Add dynamic debugging
platform/x86: intel-wmi-thunderbolt: Convert to use SPDX identifier
...
Diffstat (limited to 'drivers/platform/x86/intel_cht_int33fe.c')
-rw-r--r-- | drivers/platform/x86/intel_cht_int33fe.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c index f40b1c192106..464fe93657b5 100644 --- a/drivers/platform/x86/intel_cht_int33fe.c +++ b/drivers/platform/x86/intel_cht_int33fe.c | |||
@@ -1,12 +1,9 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0 | ||
1 | /* | 2 | /* |
2 | * Intel Cherry Trail ACPI INT33FE pseudo device driver | 3 | * Intel Cherry Trail ACPI INT33FE pseudo device driver |
3 | * | 4 | * |
4 | * Copyright (C) 2017 Hans de Goede <hdegoede@redhat.com> | 5 | * Copyright (C) 2017 Hans de Goede <hdegoede@redhat.com> |
5 | * | 6 | * |
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | * Some Intel Cherry Trail based device which ship with Windows 10, have | 7 | * Some Intel Cherry Trail based device which ship with Windows 10, have |
11 | * this weird INT33FE ACPI device with a CRS table with 4 I2cSerialBusV2 | 8 | * this weird INT33FE ACPI device with a CRS table with 4 I2cSerialBusV2 |
12 | * resources, for 4 different chips attached to various i2c busses: | 9 | * resources, for 4 different chips attached to various i2c busses: |
@@ -257,4 +254,4 @@ module_platform_driver(cht_int33fe_driver); | |||
257 | 254 | ||
258 | MODULE_DESCRIPTION("Intel Cherry Trail ACPI INT33FE pseudo device driver"); | 255 | MODULE_DESCRIPTION("Intel Cherry Trail ACPI INT33FE pseudo device driver"); |
259 | MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>"); | 256 | MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>"); |
260 | MODULE_LICENSE("GPL"); | 257 | MODULE_LICENSE("GPL v2"); |