gpio: rockchip: lock GPIOs used as interrupts

Use the standard gpiochip request/release resource functions so that any
GPIOs used as interrupts are properly locked.  This allows libgpiod to
correctly show these GPIOs as in-use.

Signed-off-by: John Keeping <john@metanate.com>
Tested-by: Nicolas Frattaroli <frattaroli.nicolas@gmail.com>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>

diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c
index ce63cbd..c1b8e5d 100644 (file)
--- a/drivers/gpio/gpio-rockchip.c
+++ b/drivers/gpio/gpio-rockchip.c
@@ -465,6 +465,22 @@ out:
        return ret;
 }
 
+static int rockchip_irq_reqres(struct irq_data *d)
+{
+       struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+       struct rockchip_pin_bank *bank = gc->private;
+
+       return gpiochip_reqres_irq(&bank->gpio_chip, d->hwirq);
+}
+
+static void rockchip_irq_relres(struct irq_data *d)
+{
+       struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+       struct rockchip_pin_bank *bank = gc->private;
+
+       gpiochip_relres_irq(&bank->gpio_chip, d->hwirq);
+}
+
 static void rockchip_irq_suspend(struct irq_data *d)
 {
        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
@@ -536,6 +552,8 @@ static int rockchip_interrupts_register(struct rockchip_pin_bank *bank)
        gc->chip_types[0].chip.irq_suspend = rockchip_irq_suspend;
        gc->chip_types[0].chip.irq_resume = rockchip_irq_resume;
        gc->chip_types[0].chip.irq_set_type = rockchip_irq_set_type;
+       gc->chip_types[0].chip.irq_request_resources = rockchip_irq_reqres;
+       gc->chip_types[0].chip.irq_release_resources = rockchip_irq_relres;
        gc->wake_enabled = IRQ_MSK(bank->nr_pins);
 
        /*