mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
gpiolib: override irq_enable/disable
When using the gpiolib irqchip helpers install irq_enable/disable hooks for the irqchip to ensure that gpiolib knows when the irq is enabled or disabled, allowing drivers to disable the irq and then use it as an output pin, and later switch the direction to input and re-enable the irq. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
4e9439ddac
commit
461c1a7d47
2 changed files with 53 additions and 4 deletions
|
@ -1826,6 +1826,28 @@ static void gpiochip_irq_relres(struct irq_data *d)
|
|||
gpiochip_relres_irq(chip, d->hwirq);
|
||||
}
|
||||
|
||||
static void gpiochip_irq_enable(struct irq_data *d)
|
||||
{
|
||||
struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
|
||||
|
||||
gpiochip_enable_irq(chip, d->hwirq);
|
||||
if (chip->irq.irq_enable)
|
||||
chip->irq.irq_enable(d);
|
||||
else
|
||||
chip->irq.chip->irq_unmask(d);
|
||||
}
|
||||
|
||||
static void gpiochip_irq_disable(struct irq_data *d)
|
||||
{
|
||||
struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
|
||||
|
||||
if (chip->irq.irq_disable)
|
||||
chip->irq.irq_disable(d);
|
||||
else
|
||||
chip->irq.chip->irq_mask(d);
|
||||
gpiochip_disable_irq(chip, d->hwirq);
|
||||
}
|
||||
|
||||
static void gpiochip_set_irq_hooks(struct gpio_chip *gpiochip)
|
||||
{
|
||||
struct irq_chip *irqchip = gpiochip->irq.chip;
|
||||
|
@ -1835,6 +1857,12 @@ static void gpiochip_set_irq_hooks(struct gpio_chip *gpiochip)
|
|||
irqchip->irq_request_resources = gpiochip_irq_reqres;
|
||||
irqchip->irq_release_resources = gpiochip_irq_relres;
|
||||
}
|
||||
if (WARN_ON(gpiochip->irq.irq_enable))
|
||||
return;
|
||||
gpiochip->irq.irq_enable = irqchip->irq_enable;
|
||||
gpiochip->irq.irq_disable = irqchip->irq_disable;
|
||||
irqchip->irq_enable = gpiochip_irq_enable;
|
||||
irqchip->irq_disable = gpiochip_irq_disable;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1954,11 +1982,18 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
|
|||
irq_domain_remove(gpiochip->irq.domain);
|
||||
}
|
||||
|
||||
if (irqchip &&
|
||||
irqchip->irq_request_resources == gpiochip_irq_reqres) {
|
||||
irqchip->irq_request_resources = NULL;
|
||||
irqchip->irq_release_resources = NULL;
|
||||
if (irqchip) {
|
||||
if (irqchip->irq_request_resources == gpiochip_irq_reqres) {
|
||||
irqchip->irq_request_resources = NULL;
|
||||
irqchip->irq_release_resources = NULL;
|
||||
}
|
||||
if (irqchip->irq_enable == gpiochip_irq_enable) {
|
||||
irqchip->irq_enable = gpiochip->irq.irq_enable;
|
||||
irqchip->irq_disable = gpiochip->irq.irq_disable;
|
||||
}
|
||||
}
|
||||
gpiochip->irq.irq_enable = NULL;
|
||||
gpiochip->irq.irq_disable = NULL;
|
||||
gpiochip->irq.chip = NULL;
|
||||
|
||||
gpiochip_irqchip_free_valid_mask(gpiochip);
|
||||
|
|
|
@ -144,6 +144,20 @@ struct gpio_irq_chip {
|
|||
* will allocate and map all IRQs during initialization.
|
||||
*/
|
||||
unsigned int first;
|
||||
|
||||
/**
|
||||
* @irq_enable:
|
||||
*
|
||||
* Store old irq_chip irq_enable callback
|
||||
*/
|
||||
void (*irq_enable)(struct irq_data *data);
|
||||
|
||||
/**
|
||||
* @irq_disable:
|
||||
*
|
||||
* Store old irq_chip irq_disable callback
|
||||
*/
|
||||
void (*irq_disable)(struct irq_data *data);
|
||||
};
|
||||
|
||||
static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip)
|
||||
|
|
Loading…
Reference in a new issue