Skip to content

Commit

Permalink
pinctrl: bcm2835: Accept fewer than expected IRQs
Browse files Browse the repository at this point in the history
The downstream .dts files only request two GPIO IRQs. Truncate the
array of parent IRQs when irq_of_parse_and_map returns 0.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Ivan T. Ivanov <iivanov@suse.de>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20210521090158.26932-1-iivanov@suse.de
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Phil Elwell authored and Linus Walleij committed May 28, 2021
1 parent b9045af commit 4bc80da
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/pinctrl/bcm/pinctrl-bcm2835.c
Original file line number Diff line number Diff line change
Expand Up @@ -1274,9 +1274,13 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
char *name;

girq->parents[i] = irq_of_parse_and_map(np, i);
if (!is_7211)
if (!is_7211) {
if (!girq->parents[i]) {
girq->num_parents = i;
break;
}
continue;

}
/* Skip over the all banks interrupts */
pc->wake_irq[i] = irq_of_parse_and_map(np, i +
BCM2835_NUM_IRQS + 1);
Expand Down

0 comments on commit 4bc80da

Please sign in to comment.