Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1173c3c2 authored by Linus Walleij's avatar Linus Walleij
Browse files

Revert "gpio: merrifield: Pass irqchip when adding gpiochip" 



This reverts commit 8f86a5b4.

It has been established that this causes a boot regression on
both Baytrail and Cherrytrail SoCs, and we can't have that in
the final kernel release, so we need to revert it.

Reported-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 52c75f56

drivers/gpio/gpio-merrifield.c

+12 −16
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id 
{

	const struct mrfld_gpio_pinrange *range;

	const char *pinctrl_dev_name;

	struct gpio_irq_chip *girq;

	struct mrfld_gpio *priv;

	u32 gpio_base, irq_base;

	void __iomem *base;
@@ -445,21 +444,6 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id 


	raw_spin_lock_init(&priv->lock);



	girq = &priv->chip.irq;

	girq->chip = &mrfld_irqchip;

	girq->parent_handler = mrfld_irq_handler;

	girq->num_parents = 1;

	girq->parents = devm_kcalloc(&pdev->dev, girq->num_parents,

				     sizeof(*girq->parents),

				     GFP_KERNEL);

	if (!girq->parents)

		return -ENOMEM;

	girq->parents[0] = pdev->irq;

	girq->default_type = IRQ_TYPE_NONE;

	girq->handler = handle_bad_irq;



	mrfld_irq_init_hw(priv);



	pci_set_drvdata(pdev, priv);

	retval = devm_gpiochip_add_data(&pdev->dev, &priv->chip, priv);

	if (retval) {
@@ -481,6 +465,18 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id 
		}

	}



	retval = gpiochip_irqchip_add(&priv->chip, &mrfld_irqchip, irq_base,

				      handle_bad_irq, IRQ_TYPE_NONE);

	if (retval) {

		dev_err(&pdev->dev, "could not connect irqchip to gpiochip\n");

		return retval;

	}



	mrfld_irq_init_hw(priv);



	gpiochip_set_chained_irqchip(&priv->chip, &mrfld_irqchip, pdev->irq,

				     mrfld_irq_handler);



	return 0;

}