[PATCH] pinctrl: bcm2835: Accept fewer than expected IRQs

[PATCH] pinctrl: bcm2835: Accept fewer than expected IRQs

[Ivan T. Ivanov]

From: Phil Elwell <phil@raspberrypi.com>

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>
---
 drivers/pinctrl/bcm/pinctrl-bcm2835.c | 8 ++++++--
 1 file 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);
-- 
2.31.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] pinctrl: bcm2835: Accept fewer than expected IRQs

[Florian Fainelli]

On 5/21/2021 2:01 AM, Ivan T. Ivanov wrote:
> From: Phil Elwell <phil@raspberrypi.com>
> 
> 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>
> ---
>  drivers/pinctrl/bcm/pinctrl-bcm2835.c | 8 ++++++--
>  1 file 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;

This assumes that interrupts are specified in an ordered way and skipped
in an ordered way as well, however given that we just hand
girq->parents[] to the GPIOLIB core, I don't really see a better solution:

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] pinctrl: bcm2835: Accept fewer than expected IRQs

[Linus Walleij]

On Fri, May 21, 2021 at 11:02 AM Ivan T. Ivanov <iivanov@suse.de> wrote:

> From: Phil Elwell <phil@raspberrypi.com>
>
> 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>

Patch applied.

Yours,
Linus Walleij

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel