1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 6ee3a25ae731..f73ff28f77e2 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -23,7 +23,7 @@ config IOMMU_IO_PGTABLE
 config IOMMU_IO_PGTABLE_LPAE
         bool "ARMv7/v8 Long Descriptor Format"
         select IOMMU_IO_PGTABLE
-        depends on HAS_DMA && (ARM || ARM64 || COMPILE_TEST)
+        depends on HAS_DMA && (ARM || ARM64 || (COMPILE_TEST && !GENERIC_ATOMIC64))
         help
           Enable support for the ARM long descriptor pagetable format.
           This allocator supports 4K/2M/1G, 16K/32M and 64K/512M page
@@ -219,7 +219,7 @@ config OMAP_IOMMU_DEBUG
 
 config ROCKCHIP_IOMMU
         bool "Rockchip IOMMU Support"
-        depends on ARM
+        depends on ARM || ARM64
         depends on ARCH_ROCKCHIP || COMPILE_TEST
         select IOMMU_API
         select ARM_DMA_USE_IOMMU
@@ -274,7 +274,7 @@ config EXYNOS_IOMMU_DEBUG
 
 config IPMMU_VMSA
         bool "Renesas VMSA-compatible IPMMU"
-        depends on ARM_LPAE
+        depends on ARM || IOMMU_DMA
         depends on ARCH_RENESAS || COMPILE_TEST
         select IOMMU_API
         select IOMMU_IO_PGTABLE_LPAE