From bec9314fb33012c8908bb209e8d0c694f46d665e Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 22 Jul 2020 15:50:40 +0530 Subject: [PATCH] ANDROID: soc: qcom: cmd-db: Allow COMMAND_DB driver to be loaded as a module This patch allow the Qcom cmd-db driver to be loaded as a permanent module. It can be loaded as a module, but can't be unloaded. That should be OK because few core Qcom drivers, mainly RPMH, which depend on cmd-db are configured as permanent modules as well. This version is only for android11-5.4. For android-mainline and android12-5.4, the fix will come from upstream. Bug: 161128971 Signed-off-by: Amit Pundir Signed-off-by: John Stultz Signed-off-by: Todd Kjos Change-Id: I5bec1700b3202024c7f16bff9e823d658a371ac5 --- arch/arm64/configs/db845c_gki.fragment | 1 + arch/arm64/configs/gki_defconfig | 1 - drivers/soc/qcom/Kconfig | 2 +- drivers/soc/qcom/cmd-db.c | 5 +++++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment index e14371f039d7..6dfc5f943a70 100644 --- a/arch/arm64/configs/db845c_gki.fragment +++ b/arch/arm64/configs/db845c_gki.fragment @@ -65,3 +65,4 @@ CONFIG_QCOM_SCM=m CONFIG_ARM_SMMU=m CONFIG_INCREMENTAL_FS=m CONFIG_PINCTRL_MSM=m +CONFIG_QCOM_COMMAND_DB=m diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index cae9e4ae8d58..6b6f7d9e4fb7 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -420,7 +420,6 @@ CONFIG_MAILBOX=y CONFIG_IOMMU_LIMIT_IOVA_ALIGNMENT=y CONFIG_REMOTEPROC=y CONFIG_RPMSG_CHAR=y -CONFIG_QCOM_COMMAND_DB=y CONFIG_DEVFREQ_GOV_PERFORMANCE=y CONFIG_DEVFREQ_GOV_POWERSAVE=y CONFIG_DEVFREQ_GOV_USERSPACE=y diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index f940ca529604..90db4559373c 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -17,7 +17,7 @@ config QCOM_AOSS_QMP Subsystem (AOSS) using Qualcomm Messaging Protocol (QMP). config QCOM_COMMAND_DB - bool "Qualcomm Command DB" + tristate "Qualcomm Command DB" depends on ARCH_QCOM || COMPILE_TEST depends on OF_RESERVED_MEM help diff --git a/drivers/soc/qcom/cmd-db.c b/drivers/soc/qcom/cmd-db.c index f6c3d17b05c7..1967757a2066 100644 --- a/drivers/soc/qcom/cmd-db.c +++ b/drivers/soc/qcom/cmd-db.c @@ -2,6 +2,7 @@ /* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. */ #include +#include #include #include #include @@ -266,6 +267,7 @@ static const struct of_device_id cmd_db_match_table[] = { { .compatible = "qcom,cmd-db" }, { }, }; +MODULE_DEVICE_TABLE(of, cmd_db_match_table); static struct platform_driver cmd_db_dev_driver = { .probe = cmd_db_dev_probe, @@ -280,3 +282,6 @@ static int __init cmd_db_device_init(void) return platform_driver_register(&cmd_db_dev_driver); } arch_initcall(cmd_db_device_init); + +MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Command DB for QCOM SoCs"); +MODULE_LICENSE("GPL v2");