Commit 8dc24866 authored by Linus Walleij's avatar Linus Walleij
Browse files

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



This reverts commit d0511b54.

After some time it was noticed that the Tegra186 among others
were experiencing problems when making this into a module.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8d1e4f90

drivers/firmware/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -235,8 +235,8 @@ config INTEL_STRATIX10_RSU 
	  Say Y here if you want Intel RSU support.



config QCOM_SCM

	tristate "Qcom SCM driver"

	depends on (ARM && HAVE_ARM_SMCCC) || ARM64

	bool

	depends on ARM || ARM64

	select RESET_CONTROLLER



config QCOM_SCM_DOWNLOAD_MODE_DEFAULT

drivers/firmware/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 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

qcom-scm-objs += qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o

obj-$(CONFIG_QCOM_SCM)		+= qcom_scm.o qcom_scm-smc.o qcom_scm-legacy.o

obj-$(CONFIG_TI_SCI_PROTOCOL)	+= ti_sci.o

obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o

obj-$(CONFIG_TURRIS_MOX_RWTM)	+= turris-mox-rwtm.o

drivers/firmware/qcom_scm.c

+0 −4
Original line number Diff line number Diff line
@@ -1280,7 +1280,6 @@ 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 = {
@@ -1296,6 +1295,3 @@ 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");

drivers/iommu/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -248,7 +248,6 @@ config SPAPR_TCE_IOMMU 
config ARM_SMMU

	tristate "ARM Ltd. System MMU (SMMU) Support"

	depends on ARM64 || ARM || (COMPILE_TEST && !GENERIC_ATOMIC64)

	depends on QCOM_SCM || !QCOM_SCM #if QCOM_SCM=m this can't be =y

	select IOMMU_API

	select IOMMU_IO_PGTABLE_LPAE

	select ARM_DMA_USE_IOMMU if ARM
@@ -376,7 +375,6 @@ 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

drivers/net/wireless/ath/ath10k/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ config ATH10K_SNOC 
	tristate "Qualcomm ath10k SNOC support"

	depends on ATH10K

	depends on ARCH_QCOM || COMPILE_TEST

	depends on QCOM_SCM || !QCOM_SCM #if QCOM_SCM=m this can't be =y

	select QCOM_QMI_HELPERS

	help

	  This module adds support for integrated WCN3990 chip connected