diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-14 22:29:50 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-14 22:29:50 +0300 |
| commit | 30c768829af2574a2f60ca85c4cc3ba2ed8d0e58 (patch) | |
| tree | 2ee0a1abda5cf2c1053e1e4c1a6d15a19bf0f6f2 /drivers/opp | |
| parent | b96f038432362a20b96d4c52cefeb2936e2cfd2f (diff) | |
| parent | c8bb4520543823a9b3da3861304273dc7232e2c7 (diff) | |
| download | linux-30c768829af2574a2f60ca85c4cc3ba2ed8d0e58.tar.xz | |
Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
Pull ARM cpufreq updates for 5.11-rc1 from Viresh Kumar:
"This contains the following updates:
- Fix imx's NVMEM_IMX_OCOTP dependency (Arnd Bergmann).
- Add support for mt8167 and blacklist mt8516 (Fabien Parent).
- Some ->get() callback related cleanups to the tegra194 driver and
some optimizations in tegra186 driver (Jon Hunter and Sumit Gupta).
- Power scale improvements to arm_scmi driver (Lukasz Luba).
- Add missing MODULE_DEVICE_TABLE and MODULE_ALIAS to several drivers
(Pali Rohár).
- Fix error path in mediatek driver (Qinglang Miao).
- Fix memleak in ST's cpufreq driver (Yangtao Li)."
* 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: (22 commits)
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
cpufreq: ap806: Add missing MODULE_DEVICE_TABLE
cpufreq: mediatek: add missing platform_driver_unregister() on error in mtk_cpufreq_driver_init
cpufreq: tegra194: get consistent cpuinfo_cur_freq
cpufreq: blacklist mt8516 in cpufreq-dt-platdev
cpufreq: mediatek: Add support for mt8167
...
Diffstat (limited to 'drivers/opp')
| -rw-r--r-- | drivers/opp/of.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 9faeb83e4b32..16f39e2127a5 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -1335,7 +1335,7 @@ int dev_pm_opp_of_register_em(struct device *dev, struct cpumask *cpus) goto failed; } - ret = em_dev_register_perf_domain(dev, nr_opp, &em_cb, cpus); + ret = em_dev_register_perf_domain(dev, nr_opp, &em_cb, cpus, true); if (ret) goto failed; |