pinctrl: bcm2835: Accept fewer than expected IRQs
authorPhil Elwell <phil@raspberrypi.com>
Fri, 21 May 2021 09:01:58 +0000 (12:01 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 28 May 2021 00:56:13 +0000 (02:56 +0200)
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>
drivers/pinctrl/bcm/pinctrl-bcm2835.c

index 1d21129f7751c4c2f45e06f71a6af40ac8fd2d5a..2c87af1180c48a2b6d20acae52efbe260189d70e 100644 (file)
@@ -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);