diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-22 10:09:51 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-22 10:09:51 +0200 |
commit | 71f1b916d5ea4a6d781b29e2470f5870a561e82e (patch) | |
tree | 9703ff800c665561ea0f794b6a589c0df80dc670 /drivers/acpi/fan.h | |
parent | 0809edbae347a224ca1b59fb8be1c2d54389c2c6 (diff) | |
parent | f6f02040e0ca7cb2e82d8aeb8f7daf5d89acc04c (diff) | |
download | linux-71f1b916d5ea4a6d781b29e2470f5870a561e82e.tar.gz linux-71f1b916d5ea4a6d781b29e2470f5870a561e82e.tar.bz2 linux-71f1b916d5ea4a6d781b29e2470f5870a561e82e.zip |
Merge tag 'acpi-5.17-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull extra ACPI updates from Rafael Wysocki:
"These fix and clean up the ACPI CPPC driver on top of the recent
changes in it merged previously and add some new device IDs to the
ACPI DPTF driver.
Specifics:
- Fix a recently introduced endianness-related issue in the ACPI CPPC
library and clean it up on top of that (Rafael Wysocki)
- Add new device IDs for the Raptor Lake SoC to the ACPI DPTF driver
(Srinivas Pandruvada)"
* tag 'acpi-5.17-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: DPTF: Support Raptor Lake
ACPI: CPPC: Drop redundant local variable from cpc_read()
ACPI: CPPC: Fix up I/O port access in cpc_read()
Diffstat (limited to 'drivers/acpi/fan.h')
-rw-r--r-- | drivers/acpi/fan.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/fan.h b/drivers/acpi/fan.h index dc9a6efa514b..dd9bb8ca2244 100644 --- a/drivers/acpi/fan.h +++ b/drivers/acpi/fan.h @@ -10,4 +10,5 @@ {"INT3404", }, /* Fan */ \ {"INTC1044", }, /* Fan for Tiger Lake generation */ \ {"INTC1048", }, /* Fan for Alder Lake generation */ \ + {"INTC10A2", }, /* Fan for Raptor Lake generation */ \ {"PNP0C0B", } /* Generic ACPI fan */ |