diff options
| author | Olof Johansson <[email protected]> | 2019-11-03 17:19:49 -0800 |
|---|---|---|
| committer | Olof Johansson <[email protected]> | 2019-11-03 17:19:50 -0800 |
| commit | f76b6a4cbffb22bd6eda3e7ad4607116fbf5554d (patch) | |
| tree | 5a69e973f26f54bdd2872f710fb4917c49001f7f | |
| parent | 064652ad88e8bb97ae14e49ae87d40952d6e1f3e (diff) | |
| parent | befc1bab91171d25de22dbcbf41309582a63ecd7 (diff) | |
Merge tag 'tegra-for-5.5-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers
firmware: tegra: Changes for v5.5-rc1
This contains a single fix for suspend/resume on Tegra194.
* tag 'tegra-for-5.5-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
firmware: tegra: Move BPMP resume to noirq phase
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Olof Johansson <[email protected]>
| -rw-r--r-- | drivers/firmware/tegra/bpmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c index 19c56133234b..6741fcda0c37 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c @@ -804,7 +804,7 @@ static int __maybe_unused tegra_bpmp_resume(struct device *dev) } static const struct dev_pm_ops tegra_bpmp_pm_ops = { - .resume_early = tegra_bpmp_resume, + .resume_noirq = tegra_bpmp_resume, }; #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ |