diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-03-31 06:12:24 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-03-31 11:53:58 -0400 |
commit | a45860d0ba433c217d359fa2cc2a4984d18ce263 (patch) | |
tree | db1bbbcb38fec3701d58cb070a74d6ef6cb9fc71 /drivers/clocksource/timer-sun5i.c | |
parent | 5673bc5a863bd4391eab5bb85277f0f1dd1dca50 (diff) |
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/timer-sun5i.c')
-rw-r--r-- | drivers/clocksource/timer-sun5i.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c index 03f04d85ca24..87f7b810d8a8 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) | |||
137 | int ret, irq; | 137 | int ret, irq; |
138 | u32 val; | 138 | u32 val; |
139 | 139 | ||
140 | timer_base = of_iomap(node, 0); | 140 | timer_base = of_io_request_and_map(node, 0, of_node_full_name(node)); |
141 | if (!timer_base) | 141 | if (!timer_base) |
142 | panic("Can't map registers"); | 142 | panic("Can't map registers"); |
143 | 143 | ||