aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2014-08-12 09:51:22 -0400
committerLee Jones <lee.jones@linaro.org>2014-09-26 03:15:40 -0400
commit2a3377ee2d8ca15ba21caf1d420cfeaf3ba4390a (patch)
treeb5e7e54afa97b48723547b26f8952786b50dac38 /drivers/mfd
parente569d937af96bc1ec00e33285fff33ae9c1e42d6 (diff)
mfd: arizona: Avoid use of legacy IRQ mapping
regmap_add_irq_chip is called from arizona_irq_init with the irq_base specified as -1 and regmap_add_irq_chip uses if (irq_base) to check if it should use legacy IRQ mapping. As such the irq mappings are currently added with irq_domain_add_legacy, rather than irq_domain_add_linear. This is clearly a typo as there is no reason why this driver can't use irq_domain_add_linear. This patch corrects this by passing the irq_base as zero to regmap_add_irq_chip. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/arizona-irq.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c
index d420dbc0e2b0..9133d519b020 100644
--- a/drivers/mfd/arizona-irq.c
+++ b/drivers/mfd/arizona-irq.c
@@ -282,7 +282,7 @@ int arizona_irq_init(struct arizona *arizona)
282 282
283 ret = regmap_add_irq_chip(arizona->regmap, 283 ret = regmap_add_irq_chip(arizona->regmap,
284 irq_create_mapping(arizona->virq, 0), 284 irq_create_mapping(arizona->virq, 0),
285 IRQF_ONESHOT, -1, aod, 285 IRQF_ONESHOT, 0, aod,
286 &arizona->aod_irq_chip); 286 &arizona->aod_irq_chip);
287 if (ret != 0) { 287 if (ret != 0) {
288 dev_err(arizona->dev, "Failed to add AOD IRQs: %d\n", ret); 288 dev_err(arizona->dev, "Failed to add AOD IRQs: %d\n", ret);
@@ -291,7 +291,7 @@ int arizona_irq_init(struct arizona *arizona)
291 291
292 ret = regmap_add_irq_chip(arizona->regmap, 292 ret = regmap_add_irq_chip(arizona->regmap,
293 irq_create_mapping(arizona->virq, 1), 293 irq_create_mapping(arizona->virq, 1),
294 IRQF_ONESHOT, -1, irq, 294 IRQF_ONESHOT, 0, irq,
295 &arizona->irq_chip); 295 &arizona->irq_chip);
296 if (ret != 0) { 296 if (ret != 0) {
297 dev_err(arizona->dev, "Failed to add main IRQs: %d\n", ret); 297 dev_err(arizona->dev, "Failed to add main IRQs: %d\n", ret);