diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-07-15 19:04:15 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-07-15 19:04:15 +0200 |
commit | e598dd44b381b2ccd64e47034122663f55ae7089 (patch) | |
tree | daed747e891274b3e6ae06625a622cb0b12079ec /drivers/acpi/x86 | |
parent | 233323f9b9f828cd7cd5145ad811c1990b692542 (diff) | |
parent | 35ba8ec0fbd0a127df1049fc4d6c0a26a05f3bd7 (diff) | |
parent | 35c50d853adc0808996b269ec0d3bd9bcc042770 (diff) | |
parent | dde8ec86c3fdb2666f55a6c33df097cf5384b057 (diff) | |
parent | 86932cd8ccd4add4ddb3e894a0c4471aab8233c2 (diff) |
Merge branches 'acpi-x86', 'acpi-fan', 'acpi-soc' and 'acpi-cppc'
Merge changes in the ACPI x86-specific code, ACPI fan driverm ACPI LPSS
(Intel SoC) driver and the ACPI CPPC library for 6.11-rc1:
- Switch the ACPI x86 utility code and the ACPI LPSS driver to new
Intel CPU model defines (Tony Luck).
- Add hwmon interface support to the ACPI fan driver (Armin Wolf).
- Add sysfs entry for guaranteed performance to the ACPI CPPC library
and replace a ternary operator with umax() in it (Petr Tesařík,
Prabhakar Pujeri).
* acpi-x86:
ACPI: x86: Switch to new Intel CPU model defines
* acpi-fan:
ACPI: fan: Add hwmon support
* acpi-soc:
ACPI: LPSS: Switch to new Intel CPU model defines
* acpi-cppc:
ACPI: CPPC: Replace ternary operator with umax()
ACPI: CPPC: add sysfs entry for guaranteed performance