Commit 4316397c authored by Linus Walleij's avatar Linus Walleij
Browse files

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



This reverts commit 06e26b75.

According to discussions, it causes a regression.

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

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

+3 −9
Original line number Diff line number Diff line
@@ -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;