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

Commit f83549d6 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Linus Walleij
Browse files

pinctrl: sunxi: use gpiolib API to mark a GPIO used as an IRQ 



When an IRQ is started on a GPIO line, mark this GPIO as IRQ in
the gpiolib so we can keep track of the usage centrally.

Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b547c800

drivers/pinctrl/sunxi/pinctrl-sunxi.c

+17 −0
Original line number Diff line number Diff line
@@ -541,18 +541,33 @@ static int sunxi_pinctrl_irq_request_resources(struct irq_data *d) 
{

	struct sunxi_pinctrl *pctl = irq_data_get_irq_chip_data(d);

	struct sunxi_desc_function *func;

	int ret;



	func = sunxi_pinctrl_desc_find_function_by_pin(pctl,

					pctl->irq_array[d->hwirq], "irq");

	if (!func)

		return -EINVAL;



	ret = gpio_lock_as_irq(pctl->chip, pctl->irq_array[d->hwirq]);

	if (ret) {

		dev_err(pctl->dev, "unable to lock HW IRQ %lu for IRQ\n",

			irqd_to_hwirq(d));

		return ret;

	}



	/* Change muxing to INT mode */

	sunxi_pmx_set(pctl->pctl_dev, pctl->irq_array[d->hwirq], func->muxval);



	return 0;

}



static void sunxi_pinctrl_irq_release_resources(struct irq_data *d)

{

	struct sunxi_pinctrl *pctl = irq_data_get_irq_chip_data(d);



	gpio_unlock_as_irq(pctl->chip, pctl->irq_array[d->hwirq]);

}



static int sunxi_pinctrl_irq_set_type(struct irq_data *d, unsigned int type)

{

	struct sunxi_pinctrl *pctl = irq_data_get_irq_chip_data(d);
@@ -657,6 +672,7 @@ static struct irq_chip sunxi_pinctrl_edge_irq_chip = { 
	.irq_mask	= sunxi_pinctrl_irq_mask,

	.irq_unmask	= sunxi_pinctrl_irq_unmask,

	.irq_request_resources = sunxi_pinctrl_irq_request_resources,

	.irq_release_resources = sunxi_pinctrl_irq_release_resources,

	.irq_set_type	= sunxi_pinctrl_irq_set_type,

	.flags		= IRQCHIP_SKIP_SET_WAKE,

};
@@ -670,6 +686,7 @@ static struct irq_chip sunxi_pinctrl_level_irq_chip = { 
	.irq_enable	= sunxi_pinctrl_irq_ack_unmask,

	.irq_disable	= sunxi_pinctrl_irq_mask,

	.irq_request_resources = sunxi_pinctrl_irq_request_resources,

	.irq_release_resources = sunxi_pinctrl_irq_release_resources,

	.irq_set_type	= sunxi_pinctrl_irq_set_type,

	.flags		= IRQCHIP_SKIP_SET_WAKE | IRQCHIP_EOI_THREADED |

			  IRQCHIP_EOI_IF_HANDLED,