| Message ID | 20161026073550.22918-1-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 26/10/16 08:35, Stephen Boyd wrote: > 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> > --- > > Changes from v1: > * Check for IS_ERR instead > > 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 73c487da6d2a..723cc924d8d1 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -964,8 +964,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; > } > Acked-by: Marc Zyngier <marc.zyngier@arm.com> M.
On 26/10/2016 09:35, Stephen Boyd wrote: > 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> > --- Applied for 4.10. Thanks! -- Daniel
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 73c487da6d2a..723cc924d8d1 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -964,8 +964,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; }
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> --- Changes from v1: * Check for IS_ERR instead drivers/clocksource/arm_arch_timer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)