diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2016-10-26 00:35:50 -0700 |
|---|---|---|
| committer |   Daniel Lezcano <daniel.lezcano@linaro.org> | 2016-11-21 11:15:29 +0100 |
| commit | f947ee147e0895d5c0ef18e81ca7a4e4219739e3 (patch) | |
| tree | 03d9b3e89b96308635a3020e32b12b6bc7190f38 /drivers/clocksource | |
| parent | arm64: dts: rockchip: Arch counter doesn't tick in system suspend (diff) | |
| download | linux-dev-f947ee147e0895d5c0ef18e81ca7a4e4219739e3.tar.xz linux-dev-f947ee147e0895d5c0ef18e81ca7a4e4219739e3.zip | |
clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map()
Let's use the of_io_request_and_map() API so that the frame
region is protected and shows up in /proc/iomem.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index a2503db7e533..02fef6830e72 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -971,8 +971,9 @@ static int __init arch_timer_mem_init(struct device_node *np) } ret= -ENXIO; - base = arch_counter_base = of_iomap(best_frame, 0); - if (!base) { + base = arch_counter_base = of_io_request_and_map(best_frame, 0, + "arch_mem_timer"); + if (IS_ERR(base)) { pr_err("arch_timer: Can't map frame's registers\n"); goto out; } |