From f947ee147e0895d5c0ef18e81ca7a4e4219739e3 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Wed, 26 Oct 2016 00:35:50 -0700 Subject: [PATCH] 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 Signed-off-by: Daniel Lezcano Acked-by: Marc Zyngier --- drivers/clocksource/arm_arch_timer.c | 5 +++-- 1 file 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; } -- 2.20.1