From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] ARM: mxs: call stmp_reset_block() in icoll
Date: Mon, 25 Mar 2013 23:22:50 +0800 [thread overview]
Message-ID: <1364224971-28431-3-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1364224971-28431-1-git-send-email-shawn.guo@linaro.org>
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>
---
arch/arm/mach-mxs/icoll.c | 4 ++--
1 file 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);
--
1.7.9.5
next prev parent reply other threads:[~2013-03-25 15:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-25 15:22 [PATCH 0/3] ARM: mxs: icoll code cleanup Shawn Guo
2013-03-25 15:22 ` [PATCH 1/3] ARM: mxs: get icoll base address from device tree Shawn Guo
2013-03-25 15:22 ` Shawn Guo [this message]
2013-03-25 15:22 ` [PATCH 3/3] ARM: mxs: move icoll driver into drivers/irqchip Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364224971-28431-3-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).