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

Commit 806766af authored by Linus Walleij's avatar Linus Walleij
Browse files

Revert "gpio: merrifield: Move hardware initialization to callback" 



This reverts commit 4c875409.

This revert is a prerequisite for the later revert of commit
8f86a5b4.

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 459f7cb9

drivers/gpio/gpio-merrifield.c

+3 −5
Original line number Diff line number Diff line
@@ -362,9 +362,8 @@ static void mrfld_irq_handler(struct irq_desc *desc) 
	chained_irq_exit(irqchip, desc);

}



static int mrfld_irq_init_hw(struct gpio_chip *chip)

static void mrfld_irq_init_hw(struct mrfld_gpio *priv)

{

	struct mrfld_gpio *priv = gpiochip_get_data(chip);

	void __iomem *reg;

	unsigned int base;
@@ -376,8 +375,6 @@ static int mrfld_irq_init_hw(struct gpio_chip *chip) 
		reg = gpio_reg(&priv->chip, base, GFER);

		writel(0, reg);

	}



	return 0;

}



static const char *mrfld_gpio_get_pinctrl_dev_name(struct mrfld_gpio *priv)
@@ -450,7 +447,6 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id 


	girq = &priv->chip.irq;

	girq->chip = &mrfld_irqchip;

	girq->init_hw = mrfld_irq_init_hw;

	girq->parent_handler = mrfld_irq_handler;

	girq->num_parents = 1;

	girq->parents = devm_kcalloc(&pdev->dev, girq->num_parents,
@@ -463,6 +459,8 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id 
	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) {