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

Commit 655dada6 authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: sirf: 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.

Also assign the gpio_chip.dev pointer to be used for error
messages.

Cc: Barry Song <Baohua.Song@csr.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b07ddcdc

drivers/pinctrl/sirf/pinctrl-sirf.c

+23 −0
Original line number Diff line number Diff line
@@ -594,12 +594,34 @@ static int sirfsoc_gpio_irq_type(struct irq_data *d, unsigned type) 
	return 0;

}



static unsigned int sirfsoc_gpio_irq_startup(struct irq_data *d)

{

	struct sirfsoc_gpio_bank *bank = irq_data_get_irq_chip_data(d);



	if (gpio_lock_as_irq(&bank->chip.gc, d->hwirq))

		dev_err(bank->chip.gc.dev,

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

			d->hwirq);

	sirfsoc_gpio_irq_unmask(d);

	return 0;

}



static void sirfsoc_gpio_irq_shutdown(struct irq_data *d)

{

	struct sirfsoc_gpio_bank *bank = irq_data_get_irq_chip_data(d);



	sirfsoc_gpio_irq_mask(d);

	gpio_unlock_as_irq(&bank->chip.gc, d->hwirq);

}



static struct irq_chip sirfsoc_irq_chip = {

	.name = "sirf-gpio-irq",

	.irq_ack = sirfsoc_gpio_irq_ack,

	.irq_mask = sirfsoc_gpio_irq_mask,

	.irq_unmask = sirfsoc_gpio_irq_unmask,

	.irq_set_type = sirfsoc_gpio_irq_type,

	.irq_startup = sirfsoc_gpio_irq_startup,

	.irq_shutdown = sirfsoc_gpio_irq_shutdown,

};



static void sirfsoc_gpio_handle_irq(unsigned int irq, struct irq_desc *desc)
@@ -877,6 +899,7 @@ static int sirfsoc_gpio_probe(struct device_node *np) 
		bank->chip.gc.of_node = np;

		bank->chip.gc.of_xlate = sirfsoc_gpio_of_xlate;

		bank->chip.gc.of_gpio_n_cells = 2;

		bank->chip.gc.dev = &pdev->dev;

		bank->chip.regs = regs;

		bank->id = i;

		bank->is_marco = is_marco;