From: Dmitry Osipenko <digetx@gmail.com>
Date: Tue, 18 Jun 2019 14:03:56 +0000 (+0300)
Subject: clocksource/drivers/tegra: Restore base address before cleanup
X-Git-Tag: v5.1.20~218
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34316acedbec50584544d776463cb55ee3af16c9;p=thirdparty%2Fkernel%2Fstable.git

clocksource/drivers/tegra: Restore base address before cleanup

[ Upstream commit fc9babc2574691d3bbf0428f007b22261fed55c6 ]

We're adjusting the timer's base for each per-CPU timer to point to the
actual start of the timer since device-tree defines a compound registers
range that includes all of the timers. In this case the original base
need to be restore before calling iounmap to unmap the proper address.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Acked-by: Jon Hunter <jonathanh@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/clocksource/timer-tegra20.c b/drivers/clocksource/timer-tegra20.c
index cc18bb135a177..84adfff59fb09 100644
--- a/drivers/clocksource/timer-tegra20.c
+++ b/drivers/clocksource/timer-tegra20.c
@@ -341,6 +341,8 @@ out_irq:
 			irq_dispose_mapping(cpu_to->clkevt.irq);
 		}
 	}
+
+	to->of_base.base = timer_reg_base;
 out:
 	timer_of_cleanup(to);
 	return ret;