Commit 3aa94590 authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle

MIPS: JZ4740: read intc base address from DT

Read the base address of the SoC interrupt controller from the device
tree rather than relying upon the JZ4740_INTC_BASE_ADDR macro, in order
to remove the dependency on the asm/mach-jz4740/base.h header.
Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Brian Norris <computersforpeace@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/10145/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent ad68f8d3
...@@ -18,14 +18,13 @@ ...@@ -18,14 +18,13 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/of_address.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mach-jz4740/base.h>
#include <asm/mach-jz4740/irq.h> #include <asm/mach-jz4740/irq.h>
#include "irq.h" #include "irq.h"
...@@ -114,7 +113,11 @@ static int __init ingenic_intc_of_init(struct device_node *node, ...@@ -114,7 +113,11 @@ static int __init ingenic_intc_of_init(struct device_node *node,
goto out_unmap_irq; goto out_unmap_irq;
intc->num_chips = num_chips; intc->num_chips = num_chips;
intc->base = ioremap(JZ4740_INTC_BASE_ADDR, 0x14); intc->base = of_iomap(node, 0);
if (!intc->base) {
err = -ENODEV;
goto out_unmap_irq;
}
for (i = 0; i < num_chips; i++) { for (i = 0; i < num_chips; i++) {
/* Mask all irqs */ /* Mask all irqs */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment