diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-03-25 09:20:05 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 04:30:03 -0400 |
commit | cec6bae8ca0417002fa8e3376ab03198dcaaa82a (patch) | |
tree | c0588e57449e2344b61e2bc66fc9df75d63eb912 /arch/arm/mach-mxs | |
parent | 8256aa7129f5d0d1692f6a18b83b66fef43405ed (diff) |
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>
Diffstat (limited to 'arch/arm/mach-mxs')
-rw-r--r-- | arch/arm/mach-mxs/icoll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/icoll.c b/arch/arm/mach-mxs/icoll.c index 1cf32af1e3f6..b4d620765cf1 100644 --- a/arch/arm/mach-mxs/icoll.c +++ b/arch/arm/mach-mxs/icoll.c | |||
@@ -24,8 +24,8 @@ | |||
24 | #include <linux/of.h> | 24 | #include <linux/of.h> |
25 | #include <linux/of_address.h> | 25 | #include <linux/of_address.h> |
26 | #include <linux/of_irq.h> | 26 | #include <linux/of_irq.h> |
27 | #include <linux/stmp_device.h> | ||
27 | #include <asm/exception.h> | 28 | #include <asm/exception.h> |
28 | #include <mach/common.h> | ||
29 | 29 | ||
30 | #define HW_ICOLL_VECTOR 0x0000 | 30 | #define HW_ICOLL_VECTOR 0x0000 |
31 | #define HW_ICOLL_LEVELACK 0x0010 | 31 | #define HW_ICOLL_LEVELACK 0x0010 |
@@ -110,7 +110,7 @@ static void __init icoll_of_init(struct device_node *np, | |||
110 | * Interrupt Collector reset, which initializes the priority | 110 | * Interrupt Collector reset, which initializes the priority |
111 | * for each irq to level 0. | 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 | icoll_domain = irq_domain_add_linear(np, ICOLL_NUM_IRQS, | 115 | icoll_domain = irq_domain_add_linear(np, ICOLL_NUM_IRQS, |
116 | &icoll_irq_domain_ops, NULL); | 116 | &icoll_irq_domain_ops, NULL); |