diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-05-13 21:58:14 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-05-13 21:58:14 +0300 |
commit | d9f87a7e9a24c56e9c4827c5d8e902694a0888a5 (patch) | |
tree | a95e52f11386afb328a7294f6560a48289c5ae8b /drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | |
parent | ca86ab598ddcd8d8959659b404e1db0fd95d9790 (diff) | |
parent | dfac21b1eeefe8ae472e3fee511cfdcf7d03bb4b (diff) | |
parent | 79b510c49207489f7e019b4c397b04d22b4dfd8d (diff) | |
parent | 5a87e0020d53f21965adf42420766e4d8719a229 (diff) | |
download | linux-d9f87a7e9a24c56e9c4827c5d8e902694a0888a5.tar.xz |
Merge branches 'acpi-x86', 'acpi-dptf' and 'acpi-apei'
Merge x86-specific ACPI updates, an ACPI DPTF driver update adding new
platform support to it, and an ACPI APEI update:
- Add a num-cs device property to specify the number of chip selects
for Intel Braswell to the ACPI LPSS (Intel SoC) driver and remove a
nested CONFIG_PM #ifdef from it (Andy Shevchenko).
- Move three x86-specific ACPI files to the x86 directory (Andy
Shevchenko).
- Mark SMO8810 accel on Dell XPS 15 9550 as always present and add a
PNP_UART1_SKIP quirk for Lenovo Blade2 tablets (Hans de Goede).
- Move acpi_blacklisted() declaration to asm/acpi.h (Kuppuswamy
Sathyanarayanan).
- Add Lunar Lake support to the ACPI DPTF driver (Sumeet Pawnikar).
- Mark the einj_driver driver's remove callback as __exit because it
cannot get unbound via sysfs (Uwe Kleine-König).
* acpi-x86:
ACPI: Move acpi_blacklisted() declaration to asm/acpi.h
ACPI: x86: Add PNP_UART1_SKIP quirk for Lenovo Blade2 tablets
ACPI: x86: utils: Mark SMO8810 accel on Dell XPS 15 9550 as always present
ACPI: x86: Move LPSS to x86 folder
ACPI: x86: Move blacklist to x86 folder
ACPI: x86: Move acpi_cmos_rtc to x86 folder
ACPI: x86: Introduce a Makefile
ACPI: LPSS: Remove nested ifdeffery for CONFIG_PM
ACPI: LPSS: Advertise number of chip selects via property
* acpi-dptf:
ACPI: DPTF: Add Lunar Lake support
* acpi-apei:
ACPI: APEI: EINJ: mark remove callback as __exit