android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: firmware: QCOM_SCM: Allow qcom_scm driver to be loadable as a permenent module

Browse Source 
Allow the qcom_scm driver to be loadable as a
permenent module.

Bug: 153049053
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I7c0a3c9dc53ee9729cadd0457522ac0229de254d
This commit is contained in:
John Stultz 2020-04-03 22:09:17 +00:00 committed by Todd Kjos
parent 7943f8c425
commit 435563af8f
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/firmware/Kconfig
View File

@ -235,16 +235,18 @@ config INTEL_STRATIX10_RSU
Say Y here if you want Intel RSU support.
config QCOM_SCM
bool
tristate "Qcom SCM driver"
depends on ARM || ARM64
select RESET_CONTROLLER
config QCOM_SCM_32
def_bool y
tristate
default y
depends on QCOM_SCM && ARM
config QCOM_SCM_64
def_bool y
tristate
default y
depends on QCOM_SCM && ARM64
config QCOM_SCM_DOWNLOAD_MODE_DEFAULT

8
drivers/firmware/Makefile
View File

@ -17,9 +17,11 @@ obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o
obj-$(CONFIG_FIRMWARE_MEMMAP) += memmap.o
obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o
obj-$(CONFIG_FW_CFG_SYSFS) += qemu_fw_cfg.o
obj-$(CONFIG_QCOM_SCM) += qcom_scm.o
obj-$(CONFIG_QCOM_SCM_64) += qcom_scm-64.o
obj-$(CONFIG_QCOM_SCM_32) += qcom_scm-32.o
obj-$(CONFIG_QCOM_SCM_64) += qcom-scm-64.o
obj-$(CONFIG_QCOM_SCM_32) += qcom-scm-32.o
qcom-scm-64-objs += qcom_scm.o qcom_scm-64.o
qcom-scm-32-objs += qcom_scm.o qcom_scm-32.o
CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch armv7-a\n.arch_extension sec,-DREQUIRES_SEC=1) -march=armv7-a
obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o
obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o

4
drivers/firmware/qcom_scm.c
View File

@ -621,6 +621,7 @@ static const struct of_device_id qcom_scm_dt_match[] = {
{ .compatible = "qcom,scm" },
{}
};
MODULE_DEVICE_TABLE(of, qcom_scm_dt_match);
static struct platform_driver qcom_scm_driver = {
.driver = {
@ -636,3 +637,6 @@ static int __init qcom_scm_init(void)
return platform_driver_register(&qcom_scm_driver);
}
subsys_initcall(qcom_scm_init);
MODULE_DESCRIPTION("Qualcomm Technologies, Inc. SCM driver");
MODULE_LICENSE("GPL v2");

1
drivers/iommu/Kconfig
View File

@ -501,6 +501,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