Merge tag 'dmaengine-4.11-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[karo-tx-linux.git] / drivers / pinctrl / stm32 / pinctrl-stm32.c

diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index efc43711ff5cbcff2c94838e06ead49623ab9118..abc405be0212be794b8d1239dac8e7b757a4c945 100644 (file)
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -236,6 +236,15 @@ 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->range.id);
+       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,
@@ -243,11 +252,9 @@ static int stm32_gpio_domain_alloc(struct irq_domain *d,
                                   unsigned int nr_irqs, void *data)
 {
        struct stm32_gpio_bank *bank = d->host_data;
-       struct stm32_pinctrl *pctl = dev_get_drvdata(bank->gpio_chip.parent);
        struct irq_fwspec *fwspec = data;
        struct irq_fwspec parent_fwspec;
        irq_hw_number_t hwirq;
-       int ret;
 
        hwirq = fwspec->param[0];
        parent_fwspec.fwnode = d->parent->fwnode;
@@ -258,35 +265,15 @@ static int stm32_gpio_domain_alloc(struct irq_domain *d,
        irq_domain_set_hwirq_and_chip(d, virq, hwirq, &stm32_gpio_irq_chip,
                                      bank);
 
-       ret = gpiochip_lock_as_irq(&bank->gpio_chip, hwirq);
-       if (ret) {
-               dev_err(pctl->dev, "Unable to configure STM32 %s%ld as IRQ\n",
-                       bank->gpio_chip.label, hwirq);
-               return ret;
-       }
-
-       ret = irq_domain_alloc_irqs_parent(d, virq, nr_irqs, &parent_fwspec);
-       if (ret)
-               gpiochip_unlock_as_irq(&bank->gpio_chip, hwirq);
-
-       return ret;
-}
-
-static void stm32_gpio_domain_free(struct irq_domain *d, unsigned int virq,
-                                  unsigned int nr_irqs)
-{
-       struct stm32_gpio_bank *bank = d->host_data;
-       struct irq_data *data = irq_get_irq_data(virq);
-
-       irq_domain_free_irqs_common(d, virq, nr_irqs);
-       gpiochip_unlock_as_irq(&bank->gpio_chip, data->hwirq);
+       return irq_domain_alloc_irqs_parent(d, virq, nr_irqs, &parent_fwspec);
 }
 
 static const struct irq_domain_ops stm32_gpio_domain_ops = {
        .translate      = stm32_gpio_domain_translate,
        .alloc          = stm32_gpio_domain_alloc,
-       .free           = stm32_gpio_domain_free,
+       .free           = irq_domain_free_irqs_common,
        .activate       = stm32_gpio_domain_activate,
+       .deactivate     = stm32_gpio_domain_deactivate,
 };
 
 /* Pinctrl functions */
@@ -631,6 +618,7 @@ static const struct pinmux_ops stm32_pmx_ops = {
        .get_function_groups    = stm32_pmx_get_func_groups,
        .set_mux                = stm32_pmx_set_mux,
        .gpio_set_direction     = stm32_pmx_gpio_set_direction,
+       .strict                 = true,
 };
 
 /* Pinconf functions */