Skip to content

Commit 718b7a5

Browse files
committed
Merge tag 'acpi-5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI updates from Rafael Wysocki: "Add a new device ID for Intel Tiger Lake to the DPTF battery participant driver (Srinivas Pandruvada) and fix the Tiger Lake fan device ID (Sumeet Pawnikar)" * tag 'acpi-5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: fan: Fix Tiger Lake ACPI device ID ACPI: DPTF: Add battery participant for TigerLake
2 parents bf2d636 + ef0c44c commit 718b7a5

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

drivers/acpi/dptf/dptf_power.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ static const struct acpi_device_id int3407_device_ids[] = {
228228
{"INT3407", 0},
229229
{"INT3532", 0},
230230
{"INTC1047", 0},
231+
{"INTC1050", 0},
231232
{"", 0},
232233
};
233234
MODULE_DEVICE_TABLE(acpi, int3407_device_ids);

drivers/acpi/fan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ static int acpi_fan_remove(struct platform_device *pdev);
2525

2626
static const struct acpi_device_id fan_device_ids[] = {
2727
{"PNP0C0B", 0},
28-
{"INT1044", 0},
2928
{"INT3404", 0},
29+
{"INTC1044", 0},
3030
{"", 0},
3131
};
3232
MODULE_DEVICE_TABLE(acpi, fan_device_ids);

0 commit comments

Comments
 (0)