diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-03-25 21:20:05 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 16:30:03 +0800 |
| commit | cec6bae8ca0417002fa8e3376ab03198dcaaa82a (patch) | |
| tree | c0588e57449e2344b61e2bc66fc9df75d63eb912 | |
| parent | 8256aa7129f5d0d1692f6a18b83b66fef43405ed (diff) | |
| download | op-kernel-dev-cec6bae8ca0417002fa8e3376ab03198dcaaa82a.zip op-kernel-dev-cec6bae8ca0417002fa8e3376ab03198dcaaa82a.tar.gz | |
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>
| -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 1cf32af..b4d6207 100644 --- a/arch/arm/mach-mxs/icoll.c +++ b/arch/arm/mach-mxs/icoll.c @@ -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); |
