Commit 4bc80da5 authored by Phil Elwell's avatar Phil Elwell Committed by Linus Walleij
Browse files

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: default avatarPhil Elwell <phil@raspberrypi.com>
Signed-off-by: default avatarIvan T. Ivanov <iivanov@suse.de>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20210521090158.26932-1-iivanov@suse.de


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b9045af9

drivers/pinctrl/bcm/pinctrl-bcm2835.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -1274,9 +1274,13 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) 
		char *name;

		char *name;





		girq->parents[i] = irq_of_parse_and_map(np, i);

		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;

			continue;



		}

		/* Skip over the all banks interrupts */

		/* Skip over the all banks interrupts */

		pc->wake_irq[i] = irq_of_parse_and_map(np, i +

		pc->wake_irq[i] = irq_of_parse_and_map(np, i +

						       BCM2835_NUM_IRQS + 1);

						       BCM2835_NUM_IRQS + 1);