From: Eddie Huang <eddie.huang@mediatek.com>
To: Matthias Brugger <matthias.bgg@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Jason Cooper <jason@lakedaemon.net>
Cc: Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, srv_heupstream@mediatek.com,
Pawel Moll <pawel.moll@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Catalin Marinas <catalin.marinas@arm.com>,
Mark Brown <broonie@linaro.org>,
Will Deacon <will.deacon@arm.com>,
linux-kernel@vger.kernel.org,
Robert Richter <rrichter@cavium.com>,
Sascha Hauer <kernel@pengutronix.de>,
Kumar Gala <galak@codeaurora.org>,
Olof Johansson <olof@lixom.net>,
"Joe.C" <yingjoe.chen@mediatek.com>,
Thomas Gleixner <tglx@linutronix.de>,
Eddie Huang <eddie.huang@mediatek.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/4] irqchip: mtk-sysirq: Get irq number from register resource size
Date: Wed, 17 Dec 2014 22:17:31 +0800 [thread overview]
Message-ID: <1418825853-10934-3-git-send-email-eddie.huang@mediatek.com> (raw)
In-Reply-To: <1418825853-10934-1-git-send-email-eddie.huang@mediatek.com>
From: Yingjoe Chen <yingjoe.chen@mediatek.com>
Originally mtk-sysirq hardcoded supported irq number to 224. This
was fine since all SoCs before support the same number of irqs for
intpol.
However MT8173 intpol support 32 more irq pins, changes to get
irq number from register resource size to suppor MT8173 properly.
Signed-off-by: Yingjoe Chen <yingjoe.chen@mediatek.com>
Signed-off-by: Eddie Huang <eddie.huang@mediatek.com>
---
drivers/irqchip/irq-mtk-sysirq.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/irqchip/irq-mtk-sysirq.c b/drivers/irqchip/irq-mtk-sysirq.c
index 0b0d2c0..fadd865 100644
--- a/drivers/irqchip/irq-mtk-sysirq.c
+++ b/drivers/irqchip/irq-mtk-sysirq.c
@@ -23,8 +23,6 @@
#include "irqchip.h"
-#define MT6577_SYS_INTPOL_NUM (224)
-
struct mtk_sysirq_chip_data {
spinlock_t lock;
void __iomem *intpol_base;
@@ -124,7 +122,8 @@ static int __init mtk_sysirq_of_init(struct device_node *node,
{
struct irq_domain *domain, *domain_parent;
struct mtk_sysirq_chip_data *chip_data;
- int ret = 0;
+ struct resource res;
+ int ret, size, intpol_num;
domain_parent = irq_find_host(parent);
if (!domain_parent) {
@@ -132,19 +131,24 @@ static int __init mtk_sysirq_of_init(struct device_node *node,
return -EINVAL;
}
+ ret = of_address_to_resource(node, 0, &res);
+ if (ret)
+ return ret;
+
chip_data = kzalloc(sizeof(*chip_data), GFP_KERNEL);
if (!chip_data)
return -ENOMEM;
- chip_data->intpol_base = of_io_request_and_map(node, 0, "intpol");
- if (IS_ERR(chip_data->intpol_base)) {
+ size = resource_size(&res);
+ intpol_num = size * 8;
+ chip_data->intpol_base = ioremap(res.start, size);
+ if (!chip_data->intpol_base) {
pr_err("mtk_sysirq: unable to map sysirq register\n");
ret = PTR_ERR(chip_data->intpol_base);
goto out_free;
}
- domain = irq_domain_add_hierarchy(domain_parent, 0,
- MT6577_SYS_INTPOL_NUM, node,
+ domain = irq_domain_add_hierarchy(domain_parent, 0, intpol_num, node,
&sysirq_domain_ops, chip_data);
if (!domain) {
ret = -ENOMEM;
--
1.8.1.1.dirty
next prev parent reply other threads:[~2014-12-17 14:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-17 14:17 [PATCH v2 0/4] Add basic support for Mediatek MT8173 SoC Eddie Huang
2014-12-17 14:17 ` [PATCH v2 1/4] Document: DT: Add bindings for mediatek MT8173 Soc Platform Eddie Huang
2014-12-17 14:17 ` Eddie Huang [this message]
2014-12-17 14:17 ` [PATCH v2 3/4] arm64: dts: Add mediatek MT8173 SoC and evaluation board dts and Makefile Eddie Huang
[not found] ` <1418825853-10934-4-git-send-email-eddie.huang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2014-12-17 14:33 ` Mark Rutland
2014-12-17 15:01 ` Marc Zyngier
[not found] ` <54919AC9.2090306-5wv7dgnIgG8@public.gmane.org>
2014-12-20 20:07 ` Arnd Bergmann
2014-12-20 22:54 ` Peter Maydell
2014-12-22 9:07 ` Marc Zyngier
2014-12-23 8:02 ` Eddie Huang
2014-12-23 8:43 ` Marc Zyngier
[not found] ` <72aa7f4069a000c6e39c53e328015aa3-PqNocJHN/zZWj0EZb7rXcA@public.gmane.org>
2014-12-23 21:07 ` Arnd Bergmann
2014-12-24 8:47 ` Marc Zyngier
2014-12-23 7:30 ` Eddie Huang
2014-12-17 14:17 ` [PATCH v2 4/4] arm64: mediatek: Add MT8173 SoC Kconfig and defconfig Eddie Huang
[not found] ` <1418825853-10934-1-git-send-email-eddie.huang-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2014-12-17 14:35 ` [PATCH v2 0/4] Add basic support for Mediatek MT8173 SoC Arnd Bergmann
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=1418825853-10934-3-git-send-email-eddie.huang@mediatek.com \
--to=eddie.huang@mediatek.com \
--cc=broonie@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jason@lakedaemon.net \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=olof@lixom.net \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=rrichter@cavium.com \
--cc=srv_heupstream@mediatek.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
--cc=yingjoe.chen@mediatek.com \
/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).