Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

This reverts commit 06e26b75f5e613b400116fdb7ff6206a681ab271.

According to discussions, it causes a regression.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

+3 -9
+3 -9
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
··· 15 15 #include <linux/of.h> 16 16 #include <linux/of_address.h> 17 17 #include <linux/of_device.h> 18 + #include <linux/of_irq.h> 18 19 #include <linux/pinctrl/pinconf-generic.h> 19 20 #include <linux/pinctrl/pinconf.h> 20 21 #include <linux/pinctrl/pinctrl.h> ··· 742 741 return ret; 743 742 } 744 743 745 - nr_irq_parent = platform_irq_count(pdev); 746 - if (nr_irq_parent < 0) { 747 - if (nr_irq_parent != -EPROBE_DEFER) 748 - dev_err(dev, "Couldn't determine irq count: %pe\n", 749 - ERR_PTR(nr_irq_parent)); 750 - return nr_irq_parent; 751 - } 752 - 744 + nr_irq_parent = of_irq_count(np); 753 745 spin_lock_init(&info->irq_lock); 754 746 755 747 if (!nr_irq_parent) { ··· 779 785 if (!girq->parents) 780 786 return -ENOMEM; 781 787 for (i = 0; i < nr_irq_parent; i++) { 782 - int irq = platform_get_irq(pdev, i); 788 + int irq = irq_of_parse_and_map(np, i); 783 789 784 790 if (irq < 0) 785 791 continue;