Skip to contentSkip to conversation

cpufreq: mediatek: fix build error

PATCH Applied Arnd Bergmann 2 participants 2 messages Nov 16, 2015

Subsystems (2)
Arm MediaTek CPU frequency scaling framework
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 cpufreq: mediatek: fix build error

The recently added mt8173 cpufreq driver relies on the cpu topology that is always present on ARM64 but optional on ARM32:

drivers/cpufreq/mt8173-cpufreq.c: In function 'mtk_cpufreq_init':
drivers/cpufreq/mt8173-cpufreq.c:441:30: error: 'cpu_topology' undeclared (first use in this function)
cpumask_copy(policy->cpus, &cpu_topology[policy->cpu].core_sibling);

This refines the Kconfig dependencies so that we can still build on ARM32, but only if COMPILE_TEST is selected and the CPU topology code is present.

Signed-off-by Arnd Bergmann <[email protected]>
drivers/cpufreq/Kconfig.arm +1 -0
index 1582c1c016b0..8014c2307332 100644
@@ -84,6 +84,7 @@ config ARM_KIRKWOOD_CPUFREQ
 config ARM_MT8173_CPUFREQ
 	bool "Mediatek MT8173 CPUFreq support"
 	depends on ARCH_MEDIATEK && REGULATOR
+	depends on ARM64 || (ARM_CPU_TOPOLOGY && COMPILE_TEST)
 	depends on !CPU_THERMAL || THERMAL=y
 	select PM_OPP
 	help
Applied
#1 lore raw
Quoted 19 lines · Arnd Bergmann

The recently added mt8173 cpufreq driver relies on the cpu topology that is always present on ARM64 but optional on ARM32:

drivers/cpufreq/mt8173-cpufreq.c: In function 'mtk_cpufreq_init':
drivers/cpufreq/mt8173-cpufreq.c:441:30: error: 'cpu_topology' undeclared (first use in this function)
cpumask_copy(policy->cpus, &cpu_topology[policy->cpu].core_sibling);

This refines the Kconfig dependencies so that we can still build on ARM32, but only if COMPILE_TEST is selected and the CPU topology code is present.

Signed-off-by Arnd Bergmann <[email protected]>
drivers/cpufreq/Kconfig.arm +0 -0
index 1582c1c016b0..8014c2307332 100644

drivers/cpufreq/Kconfig.arm config ARM_KIRKWOOD_CPUFREQ · line 90

Quoted 7 lines
drivers/cpufreq/Kconfig.arm +1 -0
@@ -84,6 +84,7 @@ config ARM_KIRKWOOD_CPUFREQ
 config ARM_MT8173_CPUFREQ
 	bool "Mediatek MT8173 CPUFreq support"
 	depends on ARCH_MEDIATEK && REGULATOR
+	depends on ARM64 || (ARM_CPU_TOPOLOGY && COMPILE_TEST)
 	depends on !CPU_THERMAL || THERMAL=y
 	select PM_OPP
 	help

Applied, thanks!

Rafael