Skip to content

Commit e1f1320

Browse files
committed
Merge branch 'pm-cpufreq'
* pm-cpufreq: (31 commits) cpufreq: Fix cpufreq_online() return value on errors cpufreq: Fix up several kerneldoc comments cpufreq: stats: Use local_clock() instead of jiffies cpufreq: schedutil: Simplify sugov_update_next_freq() cpufreq: intel_pstate: Simplify intel_cpufreq_update_pstate() cpufreq: arm_scmi: Discover the power scale in performance protocol firmware: arm_scmi: Add power_scale_mw_get() interface cpufreq: tegra194: Rename tegra194_get_speed_common function cpufreq: tegra194: Remove unnecessary frequency calculation cpufreq: tegra186: Simplify cluster information lookup cpufreq: tegra186: Fix sparse 'incorrect type in assignment' warning cpufreq: imx: fix NVMEM_IMX_OCOTP dependency cpufreq: vexpress-spc: Add missing MODULE_ALIAS cpufreq: scpi: Add missing MODULE_ALIAS cpufreq: loongson1: Add missing MODULE_ALIAS cpufreq: sun50i: Add missing MODULE_DEVICE_TABLE cpufreq: st: Add missing MODULE_DEVICE_TABLE cpufreq: qcom: Add missing MODULE_DEVICE_TABLE cpufreq: mediatek: Add missing MODULE_DEVICE_TABLE cpufreq: highbank: Add missing MODULE_DEVICE_TABLE ...
2 parents f0f6dba + 30c7688 commit e1f1320

25 files changed

+331
-237
lines changed

drivers/cpufreq/Kconfig.arm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ config ARM_IMX6Q_CPUFREQ
9494
tristate "Freescale i.MX6 cpufreq support"
9595
depends on ARCH_MXC
9696
depends on REGULATOR_ANATOP
97-
select NVMEM_IMX_OCOTP
97+
depends on NVMEM_IMX_OCOTP || COMPILE_TEST
9898
select PM_OPP
9999
help
100100
This adds cpufreq driver support for Freescale i.MX6 series SoCs.

drivers/cpufreq/armada-8k-cpufreq.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,12 @@ static void __exit armada_8k_cpufreq_exit(void)
204204
}
205205
module_exit(armada_8k_cpufreq_exit);
206206

207+
static const struct of_device_id __maybe_unused armada_8k_cpufreq_of_match[] = {
208+
{ .compatible = "marvell,ap806-cpu-clock" },
209+
{ },
210+
};
211+
MODULE_DEVICE_TABLE(of, armada_8k_cpufreq_of_match);
212+
207213
MODULE_AUTHOR("Gregory Clement <[email protected]>");
208214
MODULE_DESCRIPTION("Armada 8K cpufreq driver");
209215
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)