pinctrl: stm32: set pin to gpio input when used as interrupt

This patch ensures that pin is correctly set as gpio input when it is used
as an interrupt.

Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index d3c5f5dfbbd7974258e4105e3da7114ba7b2324a..5a15c7deea78bdcb2e692116f62184caeef150f7 100644 (file)
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -219,12 +219,41 @@ static const struct gpio_chip stm32_gpio_template = {
        .to_irq                 = stm32_gpio_to_irq,
 };
 
+static int stm32_gpio_irq_request_resources(struct irq_data *irq_data)
+{
+       struct stm32_gpio_bank *bank = irq_data->domain->host_data;
+       struct stm32_pinctrl *pctl = dev_get_drvdata(bank->gpio_chip.parent);
+       int ret;
+
+       ret = stm32_gpio_direction_input(&bank->gpio_chip, irq_data->hwirq);
+       if (ret)
+               return ret;
+
+       ret = gpiochip_lock_as_irq(&bank->gpio_chip, irq_data->hwirq);
+       if (ret) {
+               dev_err(pctl->dev, "unable to lock HW IRQ %lu for IRQ\n",
+                       irq_data->hwirq);
+               return ret;
+       }
+
+       return 0;
+}
+
+static void stm32_gpio_irq_release_resources(struct irq_data *irq_data)
+{
+       struct stm32_gpio_bank *bank = irq_data->domain->host_data;
+
+       gpiochip_unlock_as_irq(&bank->gpio_chip, irq_data->hwirq);
+}
+
 static struct irq_chip stm32_gpio_irq_chip = {
        .name           = "stm32gpio",
        .irq_eoi        = irq_chip_eoi_parent,
        .irq_mask       = irq_chip_mask_parent,
        .irq_unmask     = irq_chip_unmask_parent,
        .irq_set_type   = irq_chip_set_type_parent,
+       .irq_request_resources = stm32_gpio_irq_request_resources,
+       .irq_release_resources = stm32_gpio_irq_release_resources,
 };
 
 static int stm32_gpio_domain_translate(struct irq_domain *d,
@@ -248,15 +277,6 @@ static void stm32_gpio_domain_activate(struct irq_domain *d,
        struct stm32_pinctrl *pctl = dev_get_drvdata(bank->gpio_chip.parent);
 
        regmap_field_write(pctl->irqmux[irq_data->hwirq], bank->bank_nr);
-       gpiochip_lock_as_irq(&bank->gpio_chip, irq_data->hwirq);
-}
-
-static void stm32_gpio_domain_deactivate(struct irq_domain *d,
-                                      struct irq_data *irq_data)
-{
-       struct stm32_gpio_bank *bank = d->host_data;
-
-       gpiochip_unlock_as_irq(&bank->gpio_chip, irq_data->hwirq);
 }
 
 static int stm32_gpio_domain_alloc(struct irq_domain *d,
@@ -285,7 +305,6 @@ static const struct irq_domain_ops stm32_gpio_domain_ops = {
        .alloc          = stm32_gpio_domain_alloc,
        .free           = irq_domain_free_irqs_common,
        .activate       = stm32_gpio_domain_activate,
-       .deactivate     = stm32_gpio_domain_deactivate,
 };
 
 /* Pinctrl functions */