summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2015-03-31 12:12:24 +0200
committerIngo Molnar <mingo@kernel.org>2015-03-31 17:53:58 +0200
commita45860d0ba433c217d359fa2cc2a4984d18ce263 (patch)
treedb1bbbcb38fec3701d58cb070a74d6ef6cb9fc71 /drivers/clocksource
parent5673bc5a863bd4391eab5bb85277f0f1dd1dca50 (diff)
downloadop-kernel-dev-a45860d0ba433c217d359fa2cc2a4984d18ce263.zip
op-kernel-dev-a45860d0ba433c217d359fa2cc2a4984d18ce263.tar.gz
clocksource/drivers/sun5i: Use of_io_request_and_map()
of_iomap doesn't do a request_mem_region() on the memory area defined in the DT it maps. Switch to of_io_request_and_map() to make sure we're the only users. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1427796746-373-3-git-send-email-daniel.lezcano@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/timer-sun5i.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
index 03f04d8..87f7b81 100644
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -137,7 +137,7 @@ static void __init sun5i_timer_init(struct device_node *node)
int ret, irq;
u32 val;
- timer_base = of_iomap(node, 0);
+ timer_base = of_io_request_and_map(node, 0, of_node_full_name(node));
if (!timer_base)
panic("Can't map registers");
OpenPOWER on IntegriCloud