@@ -541,9 +541,7 @@ config ACPI_PFRUT
To compile the drivers as modules, choose M here:
the modules will be called pfr_update and pfr_telemetry.
-if ARM64
source "drivers/acpi/arm64/Kconfig"
-endif
config ACPI_PPTT
bool
@@ -127,7 +127,7 @@ obj-y += pmic/
video-objs += acpi_video.o video_detect.o
obj-y += dptf/
-obj-$(CONFIG_ARM64) += arm64/
+obj-y += arm64/
obj-$(CONFIG_ACPI_VIOT) += viot.o
@@ -11,6 +11,7 @@ config ACPI_GTDT
config ACPI_AGDI
bool "Arm Generic Diagnostic Dump and Reset Device Interface"
+ depends on ARM64
depends on ARM_SDE_INTERFACE
help
Arm Generic Diagnostic Dump and Reset Device Interface (AGDI) is
@@ -4,4 +4,4 @@ obj-$(CONFIG_ACPI_IORT) += iort.o
obj-$(CONFIG_ACPI_GTDT) += gtdt.o
obj-$(CONFIG_ACPI_APMT) += apmt.o
obj-$(CONFIG_ARM_AMBA) += amba.o
-obj-y += dma.o init.o
+obj-$(CONFIG_ARM64) += dma.o init.o
@@ -318,6 +318,7 @@ config ARM_SMMU
select IOMMU_API
select IOMMU_IO_PGTABLE_LPAE
select ARM_DMA_USE_IOMMU if ARM
+ select ACPI_IORT if ACPI
help
Support for implementations of the ARM System MMU architecture
versions 1 and 2.
The arm-smmu driver can COMPILE_TEST on x86, so expand this to also enable the IORT code so it can be COMPILE_TEST'd too. Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> --- drivers/acpi/Kconfig | 2 -- drivers/acpi/Makefile | 2 +- drivers/acpi/arm64/Kconfig | 1 + drivers/acpi/arm64/Makefile | 2 +- drivers/iommu/Kconfig | 1 + 5 files changed, 4 insertions(+), 4 deletions(-)