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

Florian Fainelli f.fainelli at gmail.com
Fri May 21 08:08:47 PDT 2021



On 5/21/2021 2:01 AM, Ivan T. Ivanov wrote:
> From: Phil Elwell <phil at 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 at raspberrypi.com>
> Signed-off-by: Ivan T. Ivanov <iivanov at 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 at gmail.com>
-- 
Florian



More information about the linux-arm-kernel mailing list