Commit 06e26b75 authored by Peng Fan's avatar Peng Fan Committed by Linus Walleij
Browse files

pinctrl: mvebu: armada-37xx: use use platform api 



platform_irq_count() and platform_get_irq() is the more generic
way (independent of device trees) to determine the count of available
interrupts. So use this instead.

As platform_irq_count() might return an error code (which
of_irq_count doesn't) some additional handling is necessary.

Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/1576672860-14420-1-git-send-email-peng.fan@nxp.com


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

drivers/pinctrl/mvebu/pinctrl-armada-37xx.c

+9 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/pinctrl/pinconf-generic.h>

#include <linux/pinctrl/pinconf.h>

#include <linux/pinctrl/pinctrl.h>
@@ -739,7 +738,14 @@ static int armada_37xx_irqchip_register(struct platform_device *pdev, 
		return ret;

	}



	nr_irq_parent = of_irq_count(np);

	nr_irq_parent = platform_irq_count(pdev);

	if (nr_irq_parent < 0) {

		if (nr_irq_parent != -EPROBE_DEFER)

			dev_err(dev, "Couldn't determine irq count: %pe\n",

				ERR_PTR(nr_irq_parent));

		return nr_irq_parent;

	}



	spin_lock_init(&info->irq_lock);



	if (!nr_irq_parent) {
@@ -776,7 +782,7 @@ static int armada_37xx_irqchip_register(struct platform_device *pdev, 
	if (!girq->parents)

		return -ENOMEM;

	for (i = 0; i < nr_irq_parent; i++) {

		int irq = irq_of_parse_and_map(np, i);

		int irq = platform_get_irq(pdev, i);



		if (irq < 0)

			continue;