ANDROID: Switch CONFIG_QCOM_PDC CONFIG_QCOM_SCM and CONFIG_ARM_SMMU to be loaded as modules

To switch the QCOM_SCM driver to be loaded from a module,
we need to also switch QCOM_PDC and QCOM_ARM_SMMU to also
load from a module.

Bug: 153049053
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I0509628322b20dea5f7e16e973d93d369c0c2bff
This commit is contained in:
John Stultz 2020-04-03 22:12:09 +00:00 • committed by Todd Kjos
commit 2c4bb3b054
3 changed files with 5 additions and 3 deletions

View file

@ -66,3 +66,6 @@ CONFIG_QCOM_QFPROM=m
CONFIG_INTERCONNECT_QCOM=y
CONFIG_INTERCONNECT_QCOM_SDM845=m
CONFIG_SDCARD_FS=m
CONFIG_QCOM_PDC=m
CONFIG_QCOM_SCM=m
CONFIG_ARM_SMMU=m

View file

@ -381,7 +381,6 @@ CONFIG_COMMON_CLK_SCPI=y
CONFIG_HWSPINLOCK=y
CONFIG_MAILBOX=y
CONFIG_IOMMU_LIMIT_IOVA_ALIGNMENT=y
CONFIG_ARM_SMMU=y
CONFIG_REMOTEPROC=y
CONFIG_RPMSG_CHAR=y
CONFIG_QCOM_COMMAND_DB=y
@ -394,7 +393,6 @@ CONFIG_IIO=y
CONFIG_IIO_BUFFER=y
CONFIG_IIO_TRIGGER=y
CONFIG_PWM=y
CONFIG_QCOM_PDC=y
CONFIG_GENERIC_PHY=y
CONFIG_RAS=y
CONFIG_ANDROID=y

View file

@ -71,9 +71,10 @@ config GKI_HIDDEN_GPIO_CONFIGS
config GKI_HIDDEN_QCOM_CONFIGS
bool "Hidden QCOM configs needed for GKI"
select QCOM_SMEM_STATE
select QCOM_SCM if (ARM64)
select QCOM_GDSC if (ARCH_QCOM)
select PINCTRL_MSM if (PINCTRL && ARCH_QCOM)
select IOMMU_IO_PGTABLE_LPAE if (ARCH_QCOM)
help
Dummy config option used to enable hidden QCOM configs.
These are normally selected implicitly when a module