]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
cpufreq: scmi: add thermal dependency
authorArnd Bergmann <arnd@arndb.de>
Tue, 13 Mar 2018 09:37:33 +0000 (10:37 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 13 Mar 2018 14:26:01 +0000 (15:26 +0100)
A built-in scmi cpufreq driver cannot link against a modular
thermal framework:

drivers/cpufreq/scmi-cpufreq.o: In function `scmi_cpufreq_ready':
scmi-cpufreq.c:(.text+0x40): undefined reference to `of_cpufreq_cooling_register'
drivers/cpufreq/scmi-cpufreq.o: In function `scmi_cpufreq_exit':
scmi-cpufreq.c:(.text+0x88): undefined reference to `cpufreq_cooling_unregister'

This adds a Kconfig dependency that makes sure this configuration
is not possible, while allowing all configurations that can work.
Note that disabling CPU_THERMAL means we don't care about the
THERMAL dependency.

Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/cpufreq/Kconfig.arm

index 9bbb5b39d18a5fe267756062166768ad2825bd66..d16d109a4560a75f77941c6fea1bd21e89733882 100644 (file)
@@ -241,6 +241,7 @@ config ARM_SA1110_CPUFREQ
 config ARM_SCMI_CPUFREQ
        tristate "SCMI based CPUfreq driver"
        depends on ARM_SCMI_PROTOCOL || COMPILE_TEST
+       depends on !CPU_THERMAL || THERMAL
        select PM_OPP
        help
          This adds the CPUfreq driver support for ARM platforms using SCMI