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

Commit aa6baa7e authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: intel-mid: lock IRQs when starting them 



This uses the new API for tagging GPIO lines as in use by
IRQs. This enforces a few semantic checks on how the underlying
GPIO line is used.

ChangeLog v1->v2:
- Explicitly call the - empty - mask/unmask functions from the
  startup/shutdown hooks. These are currently empty, but maybe
  they will not be that forever, so better be safe than sorry.

Acked-by: default avatarDavid Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 0dc61623

drivers/gpio/gpio-intel-mid.c

+23 −0
Original line number Diff line number Diff line
@@ -235,11 +235,33 @@ static void intel_mid_irq_mask(struct irq_data *d) 
{

}



static unsigned int intel_mid_irq_startup(struct irq_data *d)

{

	struct intel_mid_gpio *priv = irq_data_get_irq_chip_data(d);



	if (gpio_lock_as_irq(&priv->chip, irqd_to_hwirq(d)))

		dev_err(priv->chip.dev,

			"unable to lock HW IRQ %lu for IRQ\n",

			irqd_to_hwirq(d));

	intel_mid_irq_unmask(d);

	return 0;

}



static void intel_mid_irq_shutdown(struct irq_data *d)

{

	struct intel_mid_gpio *priv = irq_data_get_irq_chip_data(d);



	intel_mid_irq_mask(d);

	gpio_unlock_as_irq(&priv->chip, irqd_to_hwirq(d));

}



static struct irq_chip intel_mid_irqchip = {

	.name		= "INTEL_MID-GPIO",

	.irq_mask	= intel_mid_irq_mask,

	.irq_unmask	= intel_mid_irq_unmask,

	.irq_set_type	= intel_mid_irq_type,

	.irq_startup	= intel_mid_irq_startup,

	.irq_shutdown	= intel_mid_irq_shutdown,

};



static const struct intel_mid_gpio_ddata gpio_lincroft = {
@@ -418,6 +440,7 @@ static int intel_gpio_probe(struct pci_dev *pdev, 


	priv->reg_base = pcim_iomap_table(pdev)[0];

	priv->chip.label = dev_name(&pdev->dev);

	priv->chip.dev = &pdev->dev;

	priv->chip.request = intel_gpio_request;

	priv->chip.direction_input = intel_gpio_direction_input;

	priv->chip.direction_output = intel_gpio_direction_output;