Commit-ID: 9aea417afa6bf52f15a5b194944b6a646d61af04 Gitweb: https://git.kernel.org/tip/9aea417afa6bf52f15a5b194944b6a646d61af04 Author: Daniel Lezcano <daniel.lezc...@linaro.org> AuthorDate: Mon, 8 Jan 2018 14:28:49 +0100 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Mon, 8 Jan 2018 17:57:24 +0100
clocksource/drivers/timer-of: Don't request the resource by name When the driver does not specify a name for the resource, don't use of_io_request_and_map() but of_iomap(). That prevents resource name allocation conflicts on some platforms which have the same name as the node. Tested-by: Benjamin Gaignard <benjamin.gaign...@st.com> Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org> Acked-by: Benjamin Gaignard <benjamin.gaign...@st.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Link: http://lkml.kernel.org/r/1515418139-23276-10-git-send-email-daniel.lezc...@linaro.org Signed-off-by: Ingo Molnar <mi...@kernel.org> --- drivers/clocksource/timer-of.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c index 25008d2..06ed88a 100644 --- a/drivers/clocksource/timer-of.c +++ b/drivers/clocksource/timer-of.c @@ -161,11 +161,11 @@ static __init void timer_of_base_exit(struct of_timer_base *of_base) static __init int timer_of_base_init(struct device_node *np, struct of_timer_base *of_base) { - const char *name = of_base->name ? of_base->name : np->full_name; - - of_base->base = of_io_request_and_map(np, of_base->index, name); + of_base->base = of_base->name ? + of_io_request_and_map(np, of_base->index, of_base->name) : + of_iomap(np, of_base->index); if (IS_ERR(of_base->base)) { - pr_err("Failed to iomap (%s)\n", name); + pr_err("Failed to iomap (%s)\n", of_base->name); return PTR_ERR(of_base->base); }
