hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pinctrl: nuvoton: npcm7xx: Pass irqchip when adding gpiochip 

We need to convert all old gpio irqchips to pass the irqchip
setup along when adding the gpio_chip. For more info see
drivers/gpio/TODO.

For chained irqchips this is a pretty straight-forward
conversion.

Cc: Tomer Maimon <tmaimon77@gmail.com>
Cc: Kun Yi <kunyi@google.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20190913113530.5536-4-linus.walleij@linaro.org
This commit is contained in:
Linus Walleij 2019-09-13 13:35:28 +02:00
parent face7c04b0
commit de0221f620
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
View File

@ -1954,6 +1954,22 @@ static int npcm7xx_gpio_register(struct npcm7xx_pinctrl *pctrl)
int ret, id;
for (id = 0 ; id < pctrl->bank_num ; id++) {
struct gpio_irq_chip *girq;
girq = &pctrl->gpio_bank[id].gc.irq;
girq->chip = &pctrl->gpio_bank[id].irq_chip;
girq->parent_handler = npcmgpio_irq_handler;
girq->num_parents = 1;
girq->parents = devm_kcalloc(pctrl->dev, 1,
sizeof(*girq->parents),
GFP_KERNEL);
if (!girq->parents) {
ret = -ENOMEM;
goto err_register;
}
girq->parents[0] = pctrl->gpio_bank[id].irq;
girq->default_type = IRQ_TYPE_NONE;
girq->handler = handle_level_irq;
ret = devm_gpiochip_add_data(pctrl->dev,
&pctrl->gpio_bank[id].gc,
&pctrl->gpio_bank[id]);
@ -1972,22 +1988,6 @@ static int npcm7xx_gpio_register(struct npcm7xx_pinctrl *pctrl)
gpiochip_remove(&pctrl->gpio_bank[id].gc);
goto err_register;
}
ret = gpiochip_irqchip_add(&pctrl->gpio_bank[id].gc,
&pctrl->gpio_bank[id].irq_chip,
0, handle_level_irq,
IRQ_TYPE_NONE);
if (ret < 0) {
dev_err(pctrl->dev,
"Failed to add IRQ chip %u\n", id);
gpiochip_remove(&pctrl->gpio_bank[id].gc);
goto err_register;
}
gpiochip_set_chained_irqchip(&pctrl->gpio_bank[id].gc,
&pctrl->gpio_bank[id].irq_chip,
pctrl->gpio_bank[id].irq,
npcmgpio_irq_handler);
}
return 0;