Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Shawn Guo <shawn.guo@linaro.org>

Shawn Guo cec6bae8 8256aa71

+2 -2
+2 -2
arch/arm/mach-mxs/icoll.c
··· 24 24 #include <linux/of.h> 25 25 #include <linux/of_address.h> 26 26 #include <linux/of_irq.h> 27 + #include <linux/stmp_device.h> 27 28 #include <asm/exception.h> 28 - #include <mach/common.h> 29 29 30 30 #define HW_ICOLL_VECTOR 0x0000 31 31 #define HW_ICOLL_LEVELACK 0x0010 ··· 110 110 * Interrupt Collector reset, which initializes the priority 111 111 * for each irq to level 0. 112 112 */ 113 - mxs_reset_block(icoll_base + HW_ICOLL_CTRL); 113 + stmp_reset_block(icoll_base + HW_ICOLL_CTRL); 114 114 115 115 icoll_domain = irq_domain_add_linear(np, ICOLL_NUM_IRQS, 116 116 &icoll_irq_domain_ops, NULL);