@@ -15,6 +15,7 @@
#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>
@@ -741,14 +742,7 @@ static int armada_37xx_irqchip_register(struct platform_device *pdev,
return ret;
}
- 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;
- }
-
+ nr_irq_parent = of_irq_count(np);
spin_lock_init(&info->irq_lock);
if (!nr_irq_parent) {
@@ -785,7 +779,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 = platform_get_irq(pdev, i);
+ int irq = irq_of_parse_and_map(np, i);
if (irq < 0)
continue;
This reverts commit 06e26b75f5e613b400116fdb7ff6206a681ab271. This commit caused a regression on Armada 37xx. The pinctrl driver says armada-37xx-pinctrl d0013800.pinctrl: invalid or no IRQ armada-37xx-pinctrl d0018800.pinctrl: invalid or no IRQ and afterwards other drivers cannot use GPIOs by this driver as IRQs. Fixes: 06e26b75f5e6 ("pinctrl: mvebu: armada-37xx: use use platform...") Signed-off-by: Marek Behún <marek.behun@nic.cz> Cc: Peng Fan <peng.fan@nxp.com> --- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)