diff options
| author | Quentin Perret <qperret@google.com> | 2019-09-26 12:30:35 +0100 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2019-10-07 18:37:15 +0530 |
| commit | da379d6a837b4da4823b41e552872128a42ae523 (patch) | |
| tree | bbbf354087ff57bbf0399f6116edd15263f37d14 | |
| parent | 799bc63ee56be9cd78689aa45bce8d8357303a59 (diff) | |
Revert "drivers: qcom: rpmh-rsc: modularize RSC controller driver"experimental-android-5.3
This reverts commit 7cbdcba442ed26b789f5b3ab18b97e3aa2686bf0.
It breaks allmodconfig:
drivers/soc/qcom/rpmhpd.o: In function `rpmhpd_aggregate_corner':
rpmhpd.c:(.text+0x8f8): undefined reference to `rpmh_write'
rpmhpd.c:(.text+0x900): undefined reference to `rpmh_write_async'
rpmhpd.c:(.text+0x9c4): undefined reference to `rpmh_write_async'
rpmhpd.c:(.text+0xa3c): undefined reference to `rpmh_write_async'
It is not obvious that QCOM_RPMH should be tristate in the first place
when QCOM_RPMHPD needs it compiled in.
Bug: 140224784
Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: I154b2d2b369c3654c41595bad91abd5a47d15206
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | drivers/soc/qcom/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/soc/qcom/rpmh-rsc.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 6b0cdba4d709..a6d1bfb17279 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -102,7 +102,7 @@ config QCOM_RMTFS_MEM Say y here if you intend to boot the modem remoteproc. config QCOM_RPMH - tristate "Qualcomm Technologies, Inc. RPM-Hardened (RPMH) Communication driver" + bool "Qualcomm RPM-Hardened (RPMH) Communication" depends on ARCH_QCOM && ARM64 || COMPILE_TEST help Support for communication with the hardened-RPM blocks in diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c index d7d9e1b8a4f1..e278fc11fe5c 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -11,7 +11,6 @@ #include <linux/io.h> #include <linux/kernel.h> #include <linux/list.h> -#include <linux/module.h> #include <linux/of.h> #include <linux/of_irq.h> #include <linux/of_platform.h> @@ -688,7 +687,9 @@ static struct platform_driver rpmh_driver = { .of_match_table = rpmh_drv_match, }, }; -builtin_platform_driver(rpmh_driver); -MODULE_LICENSE("GPL v2"); -MODULE_DESCRIPTION("Qualcomm Technologies, Inc. RPMH communication driver"); +static int __init rpmh_driver_init(void) +{ + return platform_driver_register(&rpmh_driver); +} +arch_initcall(rpmh_driver_init); |