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

Commit 7e7cda88 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

staging: mt7621-gpio: implement '.irq_[request|release]_resources' functions 



When implementing custom irqchips it is important to also
implement .irq_request_resources() and .irq_release_resources()
and make sure these call gpiochip_[un]lock_as_irq().
Add those two for this driver. Also store struct device pointer
in global state structure to be able to use 'dev_err' with the
device from 'mediatek_request_resources' function.

Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98f0703b

drivers/staging/mt7621-gpio/gpio-mt7621.c

+37 −5
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct mtk_gc { 
};



struct mtk_data {

	struct device *dev;

	void __iomem *gpio_membase;

	int gpio_irq;

	struct irq_domain *gpio_irq_domain;
@@ -231,12 +232,42 @@ mediatek_gpio_irq_type(struct irq_data *d, unsigned int type) 
	return 0;

}



static int mediatek_irq_reqres(struct irq_data *d)

{

	struct mtk_data *gpio_data = irq_data_get_irq_chip_data(d);

	int bank = irqd_to_hwirq(d) / MTK_BANK_WIDTH;

	struct mtk_gc *rg = &gpio_data->gc_map[bank];

	struct gpio_chip *gc = &rg->chip;

	int ret;



	ret = gpiochip_lock_as_irq(gc, irqd_to_hwirq(d));

	if (ret) {

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

			irqd_to_hwirq(d));

		return -EINVAL;

	}



	return 0;

}



static void mediatek_irq_relres(struct irq_data *d)

{

	struct mtk_data *gpio_data = irq_data_get_irq_chip_data(d);

	int bank = irqd_to_hwirq(d) / MTK_BANK_WIDTH;

	struct mtk_gc *rg = &gpio_data->gc_map[bank];

	struct gpio_chip *gc = &rg->chip;



	gpiochip_unlock_as_irq(gc, irqd_to_hwirq(d));

}



static struct irq_chip mediatek_gpio_irq_chip = {

	.name			= "GPIO",

	.irq_unmask		= mediatek_gpio_irq_unmask,

	.irq_mask		= mediatek_gpio_irq_mask,

	.irq_mask_ack		= mediatek_gpio_irq_mask,

	.irq_set_type		= mediatek_gpio_irq_type,

	.irq_request_resources	= mediatek_irq_reqres,

	.irq_release_resources	= mediatek_irq_relres,

};



static int
@@ -284,6 +315,7 @@ mediatek_gpio_probe(struct platform_device *pdev) 
			dev_err(&pdev->dev, "irq_domain_add_linear failed\n");

	}



	gpio_data->dev = &pdev->dev;

	platform_set_drvdata(pdev, gpio_data);



	for_each_child_of_node(np, bank)