Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8256aa71 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: mxs: get icoll base address from device tree 



Rather than using the static definition, it gets icoll base address
with mapping from device tree.

As the result, <mach/mxs.h> inclusion can be removed from the driver
now.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent c74512bf

arch/arm/mach-mxs/icoll.c

+5 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
#include <linux/irqdomain.h>

#include <linux/io.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <asm/exception.h>

#include <mach/mxs.h>

#include <mach/common.h>



#define HW_ICOLL_VECTOR				0x0000
@@ -38,7 +38,7 @@ 


#define ICOLL_NUM_IRQS		128



static void __iomem *icoll_base = MXS_IO_ADDRESS(MXS_ICOLL_BASE_ADDR);

static void __iomem *icoll_base;

static struct irq_domain *icoll_domain;



static void icoll_ack_irq(struct irq_data *d)
@@ -103,6 +103,9 @@ static struct irq_domain_ops icoll_irq_domain_ops = { 
static void __init icoll_of_init(struct device_node *np,

			  struct device_node *interrupt_parent)

{

	icoll_base = of_iomap(np, 0);

	WARN_ON(!icoll_base);



	/*

	 * Interrupt Collector reset, which initializes the priority

	 * for each irq to level 0.