Messages in this thread Patch in this message | | | Date | Fri, 9 Oct 2015 13:55:34 -0700 | From | tip-bot for Chen-Yu Tsai <> | Subject | [tip:irq/core] irqchip/sunxi-nmi: Switch to of_io_request_and_map () from of_iomap() |
| |
Commit-ID: 0e841b04c829f59a5d5745f98d2857f48882efe9 Gitweb: http://git.kernel.org/tip/0e841b04c829f59a5d5745f98d2857f48882efe9 Author: Chen-Yu Tsai <wens@csie.org> AuthorDate: Tue, 6 Oct 2015 00:42:14 +0800 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Fri, 9 Oct 2015 22:47:28 +0200
irqchip/sunxi-nmi: Switch to of_io_request_and_map() from of_iomap()
Switch to the new of_io_request_and_map() call, so the IO resource is properly held, and also shows up in /proc/iomem.
Signed-off-by: Chen-Yu Tsai <wens@csie.org> Cc: linux-arm-kernel@lists.infradead.org Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <marc.zyngier@arm.com> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Link: http://lkml.kernel.org/r/1444063334-19832-3-git-send-email-wens@csie.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- drivers/irqchip/irq-sunxi-nmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c index c4f7196..4ef1780 100644 --- a/drivers/irqchip/irq-sunxi-nmi.c +++ b/drivers/irqchip/irq-sunxi-nmi.c @@ -153,7 +153,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node, } gc = irq_get_domain_generic_chip(domain, 0); - gc->reg_base = of_iomap(node, 0); + gc->reg_base = of_io_request_and_map(node, 0, of_node_full_name(node)); if (!gc->reg_base) { pr_err("unable to map resource\n"); ret = -ENOMEM;
| |