[GIT PULL] ACPI support fixes for v7.0-rc4

From: Rafael J. Wysocki

Date: Thu Mar 12 2026 - 14:18:33 EST


Hi Linus,

Please pull from the tag

git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git \
acpi-7.0-rc4

with top-most commit 97d9960f355cca99960eb44cd1bba1d7ba1073ee

Merge branch 'acpi-osl'

on top of commit 1f318b96cc84d7c2ab792fcc0bfd42a7ca890681

Linux 7.0-rc3

to receive ACPI support fixes for 7.0-rc4.

These address a recent regression related to the ACPI video bus
driver conversion to a platform one and make some sparse warnings
go away:

- On some platforms, the ACPI companion object of the ACPI video
bus platform device is shared with multiple other platform
devices which leads to driver probe issues, so replace that
device with an auxiliary one (which arguably is a better match
for the given use case) and update the ACPI video bus driver
accordingly (Rafael Wysocki)

- Address sparse warnings in acpi_os_initialize() by adding
__iomem to a local variable declaration (Ben Dooks)

Thanks!


---------------

Ben Dooks (1):
ACPI: OSL: fix __iomem type on return from acpi_os_map_generic_address()

Rafael J. Wysocki (1):
ACPI: video: Switch over to auxiliary bus type

---------------

drivers/acpi/Kconfig | 1 +
drivers/acpi/acpi_platform.c | 2 +-
drivers/acpi/acpi_video.c | 45 ++++++++++++++++++++++----------------------
drivers/acpi/osl.c | 2 +-
drivers/acpi/scan.c | 45 ++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 70 insertions(+), 25 deletions(-)