| Message ID | 20180313114607.2061209-2-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 697a3a873c2cd085f8ee18e20f993e3c731e1b8d |
| Headers | show |
| Series | [1/2] cpufreq: scpi: add thermal dependency | expand |
On 13/03/18 11:45, Arnd Bergmann wrote: > 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. > This newly added entry is only in arm-soc linux-next. Let me know if you want pull request with other possible fixes or you want to merge directly as it might be need to suppress these errors in your build system. For now I assume you will merge this directly in your tree, so Acked-by: Sudeep Holla <sudeep.holla@arm.com> -- Regards, Sudeep
On Tue, Mar 13, 2018 at 3:09 PM, Sudeep Holla <sudeep.holla@arm.com> wrote: > > > On 13/03/18 11:45, Arnd Bergmann wrote: >> 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. >> > > This newly added entry is only in arm-soc linux-next. Let me know if you > want pull request with other possible fixes or you want to merge > directly as it might be need to suppress these errors in your build > system. For now I assume you will merge this directly in your tree, so > > Acked-by: Sudeep Holla <sudeep.holla@arm.com> I've applied it into my next/drivers branch now. Thanks for the Ack. I assume the cpufreq maintainers will pick up the other one. I'm not sure why I didn't run into that problem earlier, but today I saw both for the first time. Arnd
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index d9457d1e535c..7f56fe5183f2 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -242,6 +242,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
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. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/cpufreq/Kconfig.arm | 1 + 1 file changed, 1 insertion(+) -- 2.9.0