diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-05-29 16:40:46 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-05-29 16:40:46 +0200 |
commit | 86954c98fc3092cb6679ffcf108761b94ecdff34 (patch) | |
tree | 041f85f6905a8c1931d86908df6cbf65c321fbe4 /drivers/devfreq/tegra30-devfreq.c | |
parent | 9cb1fd0efd195590b828b9b865421ad345a4a145 (diff) | |
parent | 8fc0e48e0faefef5064f3cb803d3d12314e16ec4 (diff) | |
download | linux-86954c98fc3092cb6679ffcf108761b94ecdff34.tar.bz2 |
Merge tag 'devfreq-next-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux
Pull devfreq updates for v5.8 from Chanwoo Choi:
"1. Update devfreq core
- Use lockdep function for checking mutex state instead of manual checking.
- Replace strncpy with strscpy to fix the compile warning.
2. Update devfreq driver
- Add new imx-bus.c devfreq driver for controlling the bus frequenncy
and it registers the imx interconnect device which indicates the imx-bus.c
as the parent device. This relation make the connection between imx-bus.c
and imx interconnect nodes. In result, the imx-bus.c devfreq driver handles
the DEV_PM_QOS_MIN_FREQUENCY requirements from imx interconnect nodes
in order to support the minimum bus bandwidth of interconnect nodes.
- Delete unneed error message and update the boosting on tegra30-devfreq.c."
* tag 'devfreq-next-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux:
PM / devfreq: Use lockdep asserts instead of manual checks for locked mutex
PM / devfreq: imx-bus: Fix inconsistent IS_ERR and PTR_ERR
PM / devfreq: Replace strncpy with strscpy
PM / devfreq: imx: Register interconnect device
PM / devfreq: Add generic imx bus scaling driver
PM / devfreq: tegra30: Delete an error message in tegra_devfreq_probe()
PM / devfreq: tegra30: Make CPUFreq notifier to take into account boosting
Diffstat (limited to 'drivers/devfreq/tegra30-devfreq.c')
-rw-r--r-- | drivers/devfreq/tegra30-devfreq.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/devfreq/tegra30-devfreq.c b/drivers/devfreq/tegra30-devfreq.c index 28b2c7ca416e..e94a27804c20 100644 --- a/drivers/devfreq/tegra30-devfreq.c +++ b/drivers/devfreq/tegra30-devfreq.c @@ -420,7 +420,7 @@ tegra_actmon_cpufreq_contribution(struct tegra_devfreq *tegra, static_cpu_emc_freq = actmon_cpu_to_emc_rate(tegra, cpu_freq); - if (dev_freq >= static_cpu_emc_freq) + if (dev_freq + actmon_dev->boost_freq >= static_cpu_emc_freq) return 0; return static_cpu_emc_freq; @@ -807,10 +807,9 @@ static int tegra_devfreq_probe(struct platform_device *pdev) } err = platform_get_irq(pdev, 0); - if (err < 0) { - dev_err(&pdev->dev, "Failed to get IRQ: %d\n", err); + if (err < 0) return err; - } + tegra->irq = err; irq_set_status_flags(tegra->irq, IRQ_NOAUTOEN); |