diff options
author | Phil Elwell <phil@raspberrypi.com> | 2021-05-21 11:01:58 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2021-05-28 02:56:13 +0200 |
commit | 4bc80da53317edd1c31c183203aa7d8809c42667 (patch) | |
tree | 68954e3b79ddfc77568341cf400bccf0956c10c4 /drivers/pinctrl/bcm | |
parent | pinctrl: Fix kernel-doc (diff) | |
download | linux-4bc80da53317edd1c31c183203aa7d8809c42667.tar.xz linux-4bc80da53317edd1c31c183203aa7d8809c42667.zip |
pinctrl: bcm2835: Accept fewer than expected IRQs
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>
Diffstat (limited to 'drivers/pinctrl/bcm')
-rw-r--r-- | drivers/pinctrl/bcm/pinctrl-bcm2835.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index 1d21129f7751..2c87af1180c4 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -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); |