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

Commit cec6bae8 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: mxs: call stmp_reset_block() in icoll 



Call stmp_reset_block() rather than mxs_reset_block(), so that
<mach/common.h> inclusion can be removed from icoll driver.

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

arch/arm/mach-mxs/icoll.c

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/stmp_device.h>

#include <asm/exception.h>

#include <mach/common.h>



#define HW_ICOLL_VECTOR				0x0000

#define HW_ICOLL_LEVELACK			0x0010
@@ -110,7 +110,7 @@ static void __init icoll_of_init(struct device_node *np, 
	 * Interrupt Collector reset, which initializes the priority

	 * for each irq to level 0.

	 */

	mxs_reset_block(icoll_base + HW_ICOLL_CTRL);

	stmp_reset_block(icoll_base + HW_ICOLL_CTRL);



	icoll_domain = irq_domain_add_linear(np, ICOLL_NUM_IRQS,

					     &icoll_irq_domain_ops, NULL);