aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYingjoe Chen <yingjoe.chen@mediatek.com>2015-01-12 04:14:31 -0500
committerThomas Gleixner <tglx@linutronix.de>2015-01-26 05:38:22 -0500
commitcdb647a772e9def47594ff8ce7acf47f4d257b2e (patch)
tree12f3845461ee9f0a6f6ee68ee9573dd353d3a018
parente03f9088e22ca7e2b0de826466540e2527518e52 (diff)
irqchip: mtk-sysirq: Get irq number from register resource size
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> Cc: <srv_heupstream@mediatek.com> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> Cc: Kumar Gala <galak@codeaurora.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Olof Johansson <olof@lixom.net> Cc: Robert Richter <rrichter@cavium.com> Cc: Mark Brown <broonie@linaro.org> Cc: <linux-arm-kernel@lists.infradead.org> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: <marc.zyngier@arm.com> Cc: <peter.maydell@linaro.org> Cc: Matthias Brugger <matthias.bgg@gmail.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: Jason Cooper <jason@lakedaemon.net> Link: http://lkml.kernel.org/r/1421054073-43468-3-git-send-email-eddie.huang@mediatek.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--drivers/irqchip/irq-mtk-sysirq.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/irqchip/irq-mtk-sysirq.c b/drivers/irqchip/irq-mtk-sysirq.c
index 0b0d2c00a2df..eaf0a710e98a 100644
--- a/drivers/irqchip/irq-mtk-sysirq.c
+++ b/drivers/irqchip/irq-mtk-sysirq.c
@@ -23,8 +23,6 @@
23 23
24#include "irqchip.h" 24#include "irqchip.h"
25 25
26#define MT6577_SYS_INTPOL_NUM (224)
27
28struct mtk_sysirq_chip_data { 26struct mtk_sysirq_chip_data {
29 spinlock_t lock; 27 spinlock_t lock;
30 void __iomem *intpol_base; 28 void __iomem *intpol_base;
@@ -124,7 +122,8 @@ static int __init mtk_sysirq_of_init(struct device_node *node,
124{ 122{
125 struct irq_domain *domain, *domain_parent; 123 struct irq_domain *domain, *domain_parent;
126 struct mtk_sysirq_chip_data *chip_data; 124 struct mtk_sysirq_chip_data *chip_data;
127 int ret = 0; 125 int ret, size, intpol_num;
126 struct resource res;
128 127
129 domain_parent = irq_find_host(parent); 128 domain_parent = irq_find_host(parent);
130 if (!domain_parent) { 129 if (!domain_parent) {
@@ -132,19 +131,24 @@ static int __init mtk_sysirq_of_init(struct device_node *node,
132 return -EINVAL; 131 return -EINVAL;
133 } 132 }
134 133
134 ret = of_address_to_resource(node, 0, &res);
135 if (ret)
136 return ret;
137
135 chip_data = kzalloc(sizeof(*chip_data), GFP_KERNEL); 138 chip_data = kzalloc(sizeof(*chip_data), GFP_KERNEL);
136 if (!chip_data) 139 if (!chip_data)
137 return -ENOMEM; 140 return -ENOMEM;
138 141
139 chip_data->intpol_base = of_io_request_and_map(node, 0, "intpol"); 142 size = resource_size(&res);
140 if (IS_ERR(chip_data->intpol_base)) { 143 intpol_num = size * 8;
144 chip_data->intpol_base = ioremap(res.start, size);
145 if (!chip_data->intpol_base) {
141 pr_err("mtk_sysirq: unable to map sysirq register\n"); 146 pr_err("mtk_sysirq: unable to map sysirq register\n");
142 ret = PTR_ERR(chip_data->intpol_base); 147 ret = PTR_ERR(chip_data->intpol_base);
143 goto out_free; 148 goto out_free;
144 } 149 }
145 150
146 domain = irq_domain_add_hierarchy(domain_parent, 0, 151 domain = irq_domain_add_hierarchy(domain_parent, 0, intpol_num, node,
147 MT6577_SYS_INTPOL_NUM, node,
148 &sysirq_domain_ops, chip_data); 152 &sysirq_domain_ops, chip_data);
149 if (!domain) { 153 if (!domain) {
150 ret = -ENOMEM; 154 ret = -ENOMEM;