From dc88f358c8c554c2a96eef0e0c410af49727c57d Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Tue, 3 Dec 2019 13:15:33 -0700 Subject: [PATCH] firmware: qcom-scm: Force built in drivers to depend on QCOM SCM Some always built-in drivers have a dependency on QCOM SCM so don't enable them if QCOM SCM is built as a module. Change-Id: Ic0dedbad472d2a36220126db86d3fcbf817ce53d Signed-off-by: Jordan Crouse --- drivers/hwtracing/coresight/Kconfig | 1 + drivers/iommu/Kconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig index 5f0cbc3f8762..9027e747cc0a 100644 --- a/drivers/hwtracing/coresight/Kconfig +++ b/drivers/hwtracing/coresight/Kconfig @@ -149,6 +149,7 @@ config CORESIGHT_TPDA config CORESIGHT_TPDM bool "CoreSight Trace, Profiling & Diagnostics Monitor driver" + depends on QCOM_SCM=y help This driver provides support for configuring monitor. Monitors are primarily responsible for data set collection and support the diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 8670d670a632..f4a5a24ebee0 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -588,6 +588,7 @@ config QCOM_IOMMU # Note: iommu drivers cannot (yet?) be built as modules bool "Qualcomm IOMMU Support" depends on ARCH_QCOM || (COMPILE_TEST && !GENERIC_ATOMIC64) + depends on QCOM_SCM=y select IOMMU_API select IOMMU_IO_PGTABLE_LPAE select ARM_DMA_USE_IOMMU