* [PATCH v4 2/9] drivers: irqchip: Add STM32 external interrupts support
2016-09-06 16:45 [PATCH v4 0/9] Add STM32 EXTI interrupt controller support Alexandre TORGUE
@ 2016-09-06 16:45 ` Alexandre TORGUE
2016-09-06 17:37 ` Jason Cooper
2016-09-06 16:45 ` [PATCH v4 3/9] ARM: STM32: Select external interrupts controller Alexandre TORGUE
` (6 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Alexandre TORGUE @ 2016-09-06 16:45 UTC (permalink / raw)
To: Maxime Coquelin, Thomas Gleixner, Jason Cooper, Marc Zyngier,
Linus Walleij, Mark Rutland, Rob Herring, linux-gpio, arnd
Cc: linux-arm-kernel, linux-kernel, devicetree, Daniel Thompson,
bruherrera, lee.jones
The STM32 external interrupt controller consists of edge detectors that
generate interrupts requests or wake-up events.
Each line can be independently configured as interrupt or wake-up source,
and triggers either on rising, falling or both edges. Each line can also
be masked independently.
Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 7f87289..bc62d1f 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -264,3 +264,7 @@ config EZNPS_GIC
select IRQ_DOMAIN
help
Support the EZchip NPS400 global interrupt controller
+
+config STM32_EXTI
+ bool
+ select IRQ_DOMAIN
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index 4c203b6..96383b2 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -71,3 +71,4 @@ obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o
obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o
obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o
obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o
+obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o
diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c
new file mode 100644
index 0000000..763c17c
--- /dev/null
+++ b/drivers/irqchip/irq-stm32-exti.c
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) Maxime Coquelin 2015
+ * Author: Maxime Coquelin <mcoquelin.stm32@gmail.com>
+ * License terms: GNU General Public License (GPL), version 2
+ */
+
+#include <linux/bitops.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/irqchip.h>
+#include <linux/irqchip/chained_irq.h>
+#include <linux/irqchip/chained_irq.h>
+#include <linux/irqdomain.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+
+#define EXTI_IMR 0x0
+#define EXTI_EMR 0x4
+#define EXTI_RTSR 0x8
+#define EXTI_FTSR 0xc
+#define EXTI_SWIER 0x10
+#define EXTI_PR 0x14
+
+static void stm32_irq_handler(struct irq_desc *desc)
+{
+ struct irq_domain *domain = irq_desc_get_handler_data(desc);
+ struct irq_chip_generic *gc = domain->gc->gc[0];
+ struct irq_chip *chip = irq_desc_get_chip(desc);
+ unsigned long pending;
+ int n;
+
+ chained_irq_enter(chip, desc);
+
+ while ((pending = irq_reg_readl(gc, EXTI_PR))) {
+ for_each_set_bit(n, &pending, BITS_PER_LONG) {
+ generic_handle_irq(irq_find_mapping(domain, n));
+ irq_reg_writel(gc, BIT(n), EXTI_PR);
+ }
+ }
+
+ chained_irq_exit(chip, desc);
+}
+
+static int stm32_irq_set_type(struct irq_data *data, unsigned int type)
+{
+ struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
+ int pin = data->hwirq;
+ u32 rtsr, ftsr;
+
+ irq_gc_lock(gc);
+
+ rtsr = irq_reg_readl(gc, EXTI_RTSR);
+ ftsr = irq_reg_readl(gc, EXTI_FTSR);
+
+ switch (type) {
+ case IRQ_TYPE_EDGE_RISING:
+ rtsr |= BIT(pin);
+ ftsr &= ~BIT(pin);
+ break;
+ case IRQ_TYPE_EDGE_FALLING:
+ rtsr &= ~BIT(pin);
+ ftsr |= BIT(pin);
+ break;
+ case IRQ_TYPE_EDGE_BOTH:
+ rtsr |= BIT(pin);
+ ftsr |= BIT(pin);
+ break;
+ default:
+ irq_gc_unlock(gc);
+ return -EINVAL;
+ }
+
+ irq_reg_writel(gc, rtsr, EXTI_RTSR);
+ irq_reg_writel(gc, ftsr, EXTI_FTSR);
+
+ irq_gc_unlock(gc);
+
+ return 0;
+}
+
+static int stm32_irq_set_wake(struct irq_data *data, unsigned int on)
+{
+ struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
+ int pin = data->hwirq;
+ u32 emr;
+
+ irq_gc_lock(gc);
+
+ emr = irq_reg_readl(gc, EXTI_EMR);
+ if (on)
+ emr |= BIT(pin);
+ else
+ emr &= ~BIT(pin);
+ irq_reg_writel(gc, emr, EXTI_EMR);
+
+ irq_gc_unlock(gc);
+
+ return 0;
+}
+
+static int stm32_exti_alloc(struct irq_domain *d, unsigned int virq,
+ unsigned int nr_irqs, void *data)
+{
+ struct irq_chip_generic *gc = d->gc->gc[0];
+ struct irq_fwspec *fwspec = data;
+ irq_hw_number_t hwirq;
+
+ hwirq = fwspec->param[0];
+
+ irq_map_generic_chip(d, virq, hwirq);
+ irq_domain_set_info(d, virq, hwirq, &gc->chip_types->chip, gc,
+ handle_simple_irq, NULL, NULL);
+
+ return 0;
+}
+
+static void stm32_exti_free(struct irq_domain *d, unsigned int virq,
+ unsigned int nr_irqs)
+{
+ struct irq_data *data = irq_get_irq_data(virq);
+
+ irq_gc_mask_clr_bit(data->parent_data);
+ irq_domain_reset_irq_data(data);
+}
+
+struct irq_domain_ops irq_exti_domain_ops = {
+ .map = irq_map_generic_chip,
+ .xlate = irq_domain_xlate_onetwocell,
+ .alloc = stm32_exti_alloc,
+ .free = stm32_exti_free,
+};
+
+static int __init stm32_exti_init(struct device_node *node,
+ struct device_node *parent)
+{
+ unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
+ int nr_irqs, nr_exti, ret, i;
+ struct irq_chip_generic *gc;
+ struct irq_domain *domain;
+ void *base;
+
+ base = of_iomap(node, 0);
+ if (!base) {
+ pr_err("%s: Unable to map registers\n", node->full_name);
+ return -ENOMEM;
+ }
+
+ /* Determine number of irqs supported */
+ writel_relaxed(~0UL, base + EXTI_RTSR);
+ nr_exti = fls(readl_relaxed(base + EXTI_RTSR));
+ writel_relaxed(0, base + EXTI_RTSR);
+
+ pr_info("%s: %d External IRQs detected\n", node->full_name, nr_exti);
+
+ domain = irq_domain_add_linear(node, nr_exti,
+ &irq_exti_domain_ops, NULL);
+ if (!domain) {
+ pr_err("%s: Could not register interrupt domain.\n",
+ node->name);
+ ret = -ENOMEM;
+ goto out_unmap;
+ }
+
+ ret = irq_alloc_domain_generic_chips(domain, nr_exti, 1, "exti",
+ handle_edge_irq, clr, 0, 0);
+ if (ret) {
+ pr_err("%s: Could not allocate generic interrupt chip.\n",
+ node->full_name);
+ goto out_free_domain;
+ }
+
+ gc = domain->gc->gc[0];
+ gc->reg_base = base;
+ gc->chip_types->type = IRQ_TYPE_EDGE_BOTH;
+ gc->chip_types->chip.name = gc->chip_types[0].chip.name;
+ gc->chip_types->chip.irq_ack = irq_gc_ack_set_bit;
+ gc->chip_types->chip.irq_mask = irq_gc_mask_clr_bit;
+ gc->chip_types->chip.irq_unmask = irq_gc_mask_set_bit;
+ gc->chip_types->chip.irq_set_type = stm32_irq_set_type;
+ gc->chip_types->chip.irq_set_wake = stm32_irq_set_wake;
+ gc->chip_types->regs.ack = EXTI_PR;
+ gc->chip_types->regs.mask = EXTI_IMR;
+ gc->chip_types->handler = handle_edge_irq;
+
+ nr_irqs = of_irq_count(node);
+ for (i = 0; i < nr_irqs; i++) {
+ unsigned int irq = irq_of_parse_and_map(node, i);
+
+ irq_set_handler_data(irq, domain);
+ irq_set_chained_handler(irq, stm32_irq_handler);
+ }
+
+ return 0;
+
+out_free_domain:
+ irq_domain_remove(domain);
+out_unmap:
+ iounmap(base);
+ return ret;
+}
+
+IRQCHIP_DECLARE(stm32_exti, "st,stm32-exti", stm32_exti_init);
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH v4 2/9] drivers: irqchip: Add STM32 external interrupts support
2016-09-06 16:45 ` [PATCH v4 2/9] drivers: irqchip: Add STM32 external interrupts support Alexandre TORGUE
@ 2016-09-06 17:37 ` Jason Cooper
2016-09-08 9:03 ` Alexandre Torgue
0 siblings, 1 reply; 16+ messages in thread
From: Jason Cooper @ 2016-09-06 17:37 UTC (permalink / raw)
To: Alexandre TORGUE
Cc: Maxime Coquelin, Thomas Gleixner, Marc Zyngier, Linus Walleij,
Mark Rutland, Rob Herring, linux-gpio, arnd, linux-arm-kernel,
linux-kernel, devicetree, Daniel Thompson, bruherrera, lee.jones
On Tue, Sep 06, 2016 at 06:45:34PM +0200, Alexandre TORGUE wrote:
> The STM32 external interrupt controller consists of edge detectors that
> generate interrupts requests or wake-up events.
>
> Each line can be independently configured as interrupt or wake-up source,
> and triggers either on rising, falling or both edges. Each line can also
> be masked independently.
>
> Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
> Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
>
> diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
> index 7f87289..bc62d1f 100644
> --- a/drivers/irqchip/Kconfig
> +++ b/drivers/irqchip/Kconfig
> @@ -264,3 +264,7 @@ config EZNPS_GIC
> select IRQ_DOMAIN
> help
> Support the EZchip NPS400 global interrupt controller
> +
> +config STM32_EXTI
> + bool
> + select IRQ_DOMAIN
> diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
> index 4c203b6..96383b2 100644
> --- a/drivers/irqchip/Makefile
> +++ b/drivers/irqchip/Makefile
> @@ -71,3 +71,4 @@ obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o
> obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o
> obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o
> obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o
> +obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o
> diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c
> new file mode 100644
> index 0000000..763c17c
> --- /dev/null
> +++ b/drivers/irqchip/irq-stm32-exti.c
> @@ -0,0 +1,203 @@
> +/*
> + * Copyright (C) Maxime Coquelin 2015
> + * Author: Maxime Coquelin <mcoquelin.stm32@gmail.com>
> + * License terms: GNU General Public License (GPL), version 2
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/interrupt.h>
> +#include <linux/io.h>
> +#include <linux/irq.h>
> +#include <linux/irqchip.h>
> +#include <linux/irqchip/chained_irq.h>
> +#include <linux/irqchip/chained_irq.h>
double paste?
double paste?
If there are no other critiques, I'll fix this up when I pull in patches
1 and 2.
thx,
Jason.
> +#include <linux/irqdomain.h>
> +#include <linux/of_address.h>
> +#include <linux/of_irq.h>
> +
> +#define EXTI_IMR 0x0
> +#define EXTI_EMR 0x4
> +#define EXTI_RTSR 0x8
> +#define EXTI_FTSR 0xc
> +#define EXTI_SWIER 0x10
> +#define EXTI_PR 0x14
> +
> +static void stm32_irq_handler(struct irq_desc *desc)
> +{
> + struct irq_domain *domain = irq_desc_get_handler_data(desc);
> + struct irq_chip_generic *gc = domain->gc->gc[0];
> + struct irq_chip *chip = irq_desc_get_chip(desc);
> + unsigned long pending;
> + int n;
> +
> + chained_irq_enter(chip, desc);
> +
> + while ((pending = irq_reg_readl(gc, EXTI_PR))) {
> + for_each_set_bit(n, &pending, BITS_PER_LONG) {
> + generic_handle_irq(irq_find_mapping(domain, n));
> + irq_reg_writel(gc, BIT(n), EXTI_PR);
> + }
> + }
> +
> + chained_irq_exit(chip, desc);
> +}
> +
> +static int stm32_irq_set_type(struct irq_data *data, unsigned int type)
> +{
> + struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
> + int pin = data->hwirq;
> + u32 rtsr, ftsr;
> +
> + irq_gc_lock(gc);
> +
> + rtsr = irq_reg_readl(gc, EXTI_RTSR);
> + ftsr = irq_reg_readl(gc, EXTI_FTSR);
> +
> + switch (type) {
> + case IRQ_TYPE_EDGE_RISING:
> + rtsr |= BIT(pin);
> + ftsr &= ~BIT(pin);
> + break;
> + case IRQ_TYPE_EDGE_FALLING:
> + rtsr &= ~BIT(pin);
> + ftsr |= BIT(pin);
> + break;
> + case IRQ_TYPE_EDGE_BOTH:
> + rtsr |= BIT(pin);
> + ftsr |= BIT(pin);
> + break;
> + default:
> + irq_gc_unlock(gc);
> + return -EINVAL;
> + }
> +
> + irq_reg_writel(gc, rtsr, EXTI_RTSR);
> + irq_reg_writel(gc, ftsr, EXTI_FTSR);
> +
> + irq_gc_unlock(gc);
> +
> + return 0;
> +}
> +
> +static int stm32_irq_set_wake(struct irq_data *data, unsigned int on)
> +{
> + struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
> + int pin = data->hwirq;
> + u32 emr;
> +
> + irq_gc_lock(gc);
> +
> + emr = irq_reg_readl(gc, EXTI_EMR);
> + if (on)
> + emr |= BIT(pin);
> + else
> + emr &= ~BIT(pin);
> + irq_reg_writel(gc, emr, EXTI_EMR);
> +
> + irq_gc_unlock(gc);
> +
> + return 0;
> +}
> +
> +static int stm32_exti_alloc(struct irq_domain *d, unsigned int virq,
> + unsigned int nr_irqs, void *data)
> +{
> + struct irq_chip_generic *gc = d->gc->gc[0];
> + struct irq_fwspec *fwspec = data;
> + irq_hw_number_t hwirq;
> +
> + hwirq = fwspec->param[0];
> +
> + irq_map_generic_chip(d, virq, hwirq);
> + irq_domain_set_info(d, virq, hwirq, &gc->chip_types->chip, gc,
> + handle_simple_irq, NULL, NULL);
> +
> + return 0;
> +}
> +
> +static void stm32_exti_free(struct irq_domain *d, unsigned int virq,
> + unsigned int nr_irqs)
> +{
> + struct irq_data *data = irq_get_irq_data(virq);
> +
> + irq_gc_mask_clr_bit(data->parent_data);
> + irq_domain_reset_irq_data(data);
> +}
> +
> +struct irq_domain_ops irq_exti_domain_ops = {
> + .map = irq_map_generic_chip,
> + .xlate = irq_domain_xlate_onetwocell,
> + .alloc = stm32_exti_alloc,
> + .free = stm32_exti_free,
> +};
> +
> +static int __init stm32_exti_init(struct device_node *node,
> + struct device_node *parent)
> +{
> + unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
> + int nr_irqs, nr_exti, ret, i;
> + struct irq_chip_generic *gc;
> + struct irq_domain *domain;
> + void *base;
> +
> + base = of_iomap(node, 0);
> + if (!base) {
> + pr_err("%s: Unable to map registers\n", node->full_name);
> + return -ENOMEM;
> + }
> +
> + /* Determine number of irqs supported */
> + writel_relaxed(~0UL, base + EXTI_RTSR);
> + nr_exti = fls(readl_relaxed(base + EXTI_RTSR));
> + writel_relaxed(0, base + EXTI_RTSR);
> +
> + pr_info("%s: %d External IRQs detected\n", node->full_name, nr_exti);
> +
> + domain = irq_domain_add_linear(node, nr_exti,
> + &irq_exti_domain_ops, NULL);
> + if (!domain) {
> + pr_err("%s: Could not register interrupt domain.\n",
> + node->name);
> + ret = -ENOMEM;
> + goto out_unmap;
> + }
> +
> + ret = irq_alloc_domain_generic_chips(domain, nr_exti, 1, "exti",
> + handle_edge_irq, clr, 0, 0);
> + if (ret) {
> + pr_err("%s: Could not allocate generic interrupt chip.\n",
> + node->full_name);
> + goto out_free_domain;
> + }
> +
> + gc = domain->gc->gc[0];
> + gc->reg_base = base;
> + gc->chip_types->type = IRQ_TYPE_EDGE_BOTH;
> + gc->chip_types->chip.name = gc->chip_types[0].chip.name;
> + gc->chip_types->chip.irq_ack = irq_gc_ack_set_bit;
> + gc->chip_types->chip.irq_mask = irq_gc_mask_clr_bit;
> + gc->chip_types->chip.irq_unmask = irq_gc_mask_set_bit;
> + gc->chip_types->chip.irq_set_type = stm32_irq_set_type;
> + gc->chip_types->chip.irq_set_wake = stm32_irq_set_wake;
> + gc->chip_types->regs.ack = EXTI_PR;
> + gc->chip_types->regs.mask = EXTI_IMR;
> + gc->chip_types->handler = handle_edge_irq;
> +
> + nr_irqs = of_irq_count(node);
> + for (i = 0; i < nr_irqs; i++) {
> + unsigned int irq = irq_of_parse_and_map(node, i);
> +
> + irq_set_handler_data(irq, domain);
> + irq_set_chained_handler(irq, stm32_irq_handler);
> + }
> +
> + return 0;
> +
> +out_free_domain:
> + irq_domain_remove(domain);
> +out_unmap:
> + iounmap(base);
> + return ret;
> +}
> +
> +IRQCHIP_DECLARE(stm32_exti, "st,stm32-exti", stm32_exti_init);
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v4 2/9] drivers: irqchip: Add STM32 external interrupts support
2016-09-06 17:37 ` Jason Cooper
@ 2016-09-08 9:03 ` Alexandre Torgue
0 siblings, 0 replies; 16+ messages in thread
From: Alexandre Torgue @ 2016-09-08 9:03 UTC (permalink / raw)
To: Jason Cooper
Cc: Maxime Coquelin, Thomas Gleixner, Marc Zyngier, Linus Walleij,
Mark Rutland, Rob Herring, linux-gpio, arnd, linux-arm-kernel,
linux-kernel, devicetree, Daniel Thompson, bruherrera, lee.jones
Hi Jason,
On 09/06/2016 07:37 PM, Jason Cooper wrote:
> On Tue, Sep 06, 2016 at 06:45:34PM +0200, Alexandre TORGUE wrote:
>> The STM32 external interrupt controller consists of edge detectors that
>> generate interrupts requests or wake-up events.
>>
>> Each line can be independently configured as interrupt or wake-up source,
>> and triggers either on rising, falling or both edges. Each line can also
>> be masked independently.
>>
>> Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
>> Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
>>
>> diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
>> index 7f87289..bc62d1f 100644
>> --- a/drivers/irqchip/Kconfig
>> +++ b/drivers/irqchip/Kconfig
>> @@ -264,3 +264,7 @@ config EZNPS_GIC
>> select IRQ_DOMAIN
>> help
>> Support the EZchip NPS400 global interrupt controller
>> +
>> +config STM32_EXTI
>> + bool
>> + select IRQ_DOMAIN
>> diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
>> index 4c203b6..96383b2 100644
>> --- a/drivers/irqchip/Makefile
>> +++ b/drivers/irqchip/Makefile
>> @@ -71,3 +71,4 @@ obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o
>> obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o
>> obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o
>> obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o
>> +obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o
>> diff --git a/drivers/irqchip/irq-stm32-exti.c b/drivers/irqchip/irq-stm32-exti.c
>> new file mode 100644
>> index 0000000..763c17c
>> --- /dev/null
>> +++ b/drivers/irqchip/irq-stm32-exti.c
>> @@ -0,0 +1,203 @@
>> +/*
>> + * Copyright (C) Maxime Coquelin 2015
>> + * Author: Maxime Coquelin <mcoquelin.stm32@gmail.com>
>> + * License terms: GNU General Public License (GPL), version 2
>> + */
>> +
>> +#include <linux/bitops.h>
>> +#include <linux/interrupt.h>
>> +#include <linux/io.h>
>> +#include <linux/irq.h>
>> +#include <linux/irqchip.h>
>> +#include <linux/irqchip/chained_irq.h>
>> +#include <linux/irqchip/chained_irq.h>
>
> double paste?
> double paste?
>
> If there are no other critiques, I'll fix this up when I pull in patches
> 1 and 2.
>
Yes bad copy/paste. I have to send a v5 with Linus (W) remarks. So I
will fix it in the v5.
Thanks
Alex
> thx,
>
> Jason.
>
>> +#include <linux/irqdomain.h>
>> +#include <linux/of_address.h>
>> +#include <linux/of_irq.h>
>> +
>> +#define EXTI_IMR 0x0
>> +#define EXTI_EMR 0x4
>> +#define EXTI_RTSR 0x8
>> +#define EXTI_FTSR 0xc
>> +#define EXTI_SWIER 0x10
>> +#define EXTI_PR 0x14
>> +
>> +static void stm32_irq_handler(struct irq_desc *desc)
>> +{
>> + struct irq_domain *domain = irq_desc_get_handler_data(desc);
>> + struct irq_chip_generic *gc = domain->gc->gc[0];
>> + struct irq_chip *chip = irq_desc_get_chip(desc);
>> + unsigned long pending;
>> + int n;
>> +
>> + chained_irq_enter(chip, desc);
>> +
>> + while ((pending = irq_reg_readl(gc, EXTI_PR))) {
>> + for_each_set_bit(n, &pending, BITS_PER_LONG) {
>> + generic_handle_irq(irq_find_mapping(domain, n));
>> + irq_reg_writel(gc, BIT(n), EXTI_PR);
>> + }
>> + }
>> +
>> + chained_irq_exit(chip, desc);
>> +}
>> +
>> +static int stm32_irq_set_type(struct irq_data *data, unsigned int type)
>> +{
>> + struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
>> + int pin = data->hwirq;
>> + u32 rtsr, ftsr;
>> +
>> + irq_gc_lock(gc);
>> +
>> + rtsr = irq_reg_readl(gc, EXTI_RTSR);
>> + ftsr = irq_reg_readl(gc, EXTI_FTSR);
>> +
>> + switch (type) {
>> + case IRQ_TYPE_EDGE_RISING:
>> + rtsr |= BIT(pin);
>> + ftsr &= ~BIT(pin);
>> + break;
>> + case IRQ_TYPE_EDGE_FALLING:
>> + rtsr &= ~BIT(pin);
>> + ftsr |= BIT(pin);
>> + break;
>> + case IRQ_TYPE_EDGE_BOTH:
>> + rtsr |= BIT(pin);
>> + ftsr |= BIT(pin);
>> + break;
>> + default:
>> + irq_gc_unlock(gc);
>> + return -EINVAL;
>> + }
>> +
>> + irq_reg_writel(gc, rtsr, EXTI_RTSR);
>> + irq_reg_writel(gc, ftsr, EXTI_FTSR);
>> +
>> + irq_gc_unlock(gc);
>> +
>> + return 0;
>> +}
>> +
>> +static int stm32_irq_set_wake(struct irq_data *data, unsigned int on)
>> +{
>> + struct irq_chip_generic *gc = irq_data_get_irq_chip_data(data);
>> + int pin = data->hwirq;
>> + u32 emr;
>> +
>> + irq_gc_lock(gc);
>> +
>> + emr = irq_reg_readl(gc, EXTI_EMR);
>> + if (on)
>> + emr |= BIT(pin);
>> + else
>> + emr &= ~BIT(pin);
>> + irq_reg_writel(gc, emr, EXTI_EMR);
>> +
>> + irq_gc_unlock(gc);
>> +
>> + return 0;
>> +}
>> +
>> +static int stm32_exti_alloc(struct irq_domain *d, unsigned int virq,
>> + unsigned int nr_irqs, void *data)
>> +{
>> + struct irq_chip_generic *gc = d->gc->gc[0];
>> + struct irq_fwspec *fwspec = data;
>> + irq_hw_number_t hwirq;
>> +
>> + hwirq = fwspec->param[0];
>> +
>> + irq_map_generic_chip(d, virq, hwirq);
>> + irq_domain_set_info(d, virq, hwirq, &gc->chip_types->chip, gc,
>> + handle_simple_irq, NULL, NULL);
>> +
>> + return 0;
>> +}
>> +
>> +static void stm32_exti_free(struct irq_domain *d, unsigned int virq,
>> + unsigned int nr_irqs)
>> +{
>> + struct irq_data *data = irq_get_irq_data(virq);
>> +
>> + irq_gc_mask_clr_bit(data->parent_data);
>> + irq_domain_reset_irq_data(data);
>> +}
>> +
>> +struct irq_domain_ops irq_exti_domain_ops = {
>> + .map = irq_map_generic_chip,
>> + .xlate = irq_domain_xlate_onetwocell,
>> + .alloc = stm32_exti_alloc,
>> + .free = stm32_exti_free,
>> +};
>> +
>> +static int __init stm32_exti_init(struct device_node *node,
>> + struct device_node *parent)
>> +{
>> + unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
>> + int nr_irqs, nr_exti, ret, i;
>> + struct irq_chip_generic *gc;
>> + struct irq_domain *domain;
>> + void *base;
>> +
>> + base = of_iomap(node, 0);
>> + if (!base) {
>> + pr_err("%s: Unable to map registers\n", node->full_name);
>> + return -ENOMEM;
>> + }
>> +
>> + /* Determine number of irqs supported */
>> + writel_relaxed(~0UL, base + EXTI_RTSR);
>> + nr_exti = fls(readl_relaxed(base + EXTI_RTSR));
>> + writel_relaxed(0, base + EXTI_RTSR);
>> +
>> + pr_info("%s: %d External IRQs detected\n", node->full_name, nr_exti);
>> +
>> + domain = irq_domain_add_linear(node, nr_exti,
>> + &irq_exti_domain_ops, NULL);
>> + if (!domain) {
>> + pr_err("%s: Could not register interrupt domain.\n",
>> + node->name);
>> + ret = -ENOMEM;
>> + goto out_unmap;
>> + }
>> +
>> + ret = irq_alloc_domain_generic_chips(domain, nr_exti, 1, "exti",
>> + handle_edge_irq, clr, 0, 0);
>> + if (ret) {
>> + pr_err("%s: Could not allocate generic interrupt chip.\n",
>> + node->full_name);
>> + goto out_free_domain;
>> + }
>> +
>> + gc = domain->gc->gc[0];
>> + gc->reg_base = base;
>> + gc->chip_types->type = IRQ_TYPE_EDGE_BOTH;
>> + gc->chip_types->chip.name = gc->chip_types[0].chip.name;
>> + gc->chip_types->chip.irq_ack = irq_gc_ack_set_bit;
>> + gc->chip_types->chip.irq_mask = irq_gc_mask_clr_bit;
>> + gc->chip_types->chip.irq_unmask = irq_gc_mask_set_bit;
>> + gc->chip_types->chip.irq_set_type = stm32_irq_set_type;
>> + gc->chip_types->chip.irq_set_wake = stm32_irq_set_wake;
>> + gc->chip_types->regs.ack = EXTI_PR;
>> + gc->chip_types->regs.mask = EXTI_IMR;
>> + gc->chip_types->handler = handle_edge_irq;
>> +
>> + nr_irqs = of_irq_count(node);
>> + for (i = 0; i < nr_irqs; i++) {
>> + unsigned int irq = irq_of_parse_and_map(node, i);
>> +
>> + irq_set_handler_data(irq, domain);
>> + irq_set_chained_handler(irq, stm32_irq_handler);
>> + }
>> +
>> + return 0;
>> +
>> +out_free_domain:
>> + irq_domain_remove(domain);
>> +out_unmap:
>> + iounmap(base);
>> + return ret;
>> +}
>> +
>> +IRQCHIP_DECLARE(stm32_exti, "st,stm32-exti", stm32_exti_init);
>> --
>> 1.9.1
>>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v4 3/9] ARM: STM32: Select external interrupts controller
2016-09-06 16:45 [PATCH v4 0/9] Add STM32 EXTI interrupt controller support Alexandre TORGUE
2016-09-06 16:45 ` [PATCH v4 2/9] drivers: irqchip: Add STM32 external interrupts support Alexandre TORGUE
@ 2016-09-06 16:45 ` Alexandre TORGUE
2016-09-06 16:45 ` [PATCH v4 4/9] ARM: dts: Add EXTI controller node to stm32f429 Alexandre TORGUE
` (5 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Alexandre TORGUE @ 2016-09-06 16:45 UTC (permalink / raw)
To: Maxime Coquelin, Thomas Gleixner, Jason Cooper, Marc Zyngier,
Linus Walleij, Mark Rutland, Rob Herring, linux-gpio, arnd
Cc: linux-arm-kernel, linux-kernel, devicetree, Daniel Thompson,
bruherrera, lee.jones
Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2d601d7..157cea9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -877,6 +877,7 @@ config ARCH_STM32
select CLKSRC_STM32
select PINCTRL
select RESET_CONTROLLER
+ select STM32_EXTI
help
Support for STMicroelectronics STM32 processors.
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v4 4/9] ARM: dts: Add EXTI controller node to stm32f429
2016-09-06 16:45 [PATCH v4 0/9] Add STM32 EXTI interrupt controller support Alexandre TORGUE
2016-09-06 16:45 ` [PATCH v4 2/9] drivers: irqchip: Add STM32 external interrupts support Alexandre TORGUE
2016-09-06 16:45 ` [PATCH v4 3/9] ARM: STM32: Select external interrupts controller Alexandre TORGUE
@ 2016-09-06 16:45 ` Alexandre TORGUE
2016-09-06 16:45 ` [PATCH v4 5/9] Documentation: dt-bindings: Add IRQ related properties of STM32 pinctrl Alexandre TORGUE
` (4 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Alexandre TORGUE @ 2016-09-06 16:45 UTC (permalink / raw)
To: Maxime Coquelin, Thomas Gleixner, Jason Cooper, Marc Zyngier,
Linus Walleij, Mark Rutland, Rob Herring, linux-gpio, arnd
Cc: linux-arm-kernel, linux-kernel, devicetree, Daniel Thompson,
bruherrera, lee.jones
Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
index 35df462..1a189d4 100644
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -176,6 +176,14 @@
reg = <0x40013800 0x400>;
};
+ exti: interrupt-controller@40013c00 {
+ compatible = "st,stm32-exti";
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ reg = <0x40013C00 0x400>;
+ interrupts = <1>, <2>, <3>, <6>, <7>, <8>, <9>, <10>, <23>, <40>, <41>, <42>, <62>, <76>;
+ };
+
pin-controller {
#address-cells = <1>;
#size-cells = <1>;
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v4 5/9] Documentation: dt-bindings: Add IRQ related properties of STM32 pinctrl
2016-09-06 16:45 [PATCH v4 0/9] Add STM32 EXTI interrupt controller support Alexandre TORGUE
` (2 preceding siblings ...)
2016-09-06 16:45 ` [PATCH v4 4/9] ARM: dts: Add EXTI controller node to stm32f429 Alexandre TORGUE
@ 2016-09-06 16:45 ` Alexandre TORGUE
2016-09-06 16:45 ` [PATCH v4 6/9] pinctrl: Add IRQ support to STM32 gpios Alexandre TORGUE
` (3 subsequent siblings)
7 siblings, 0 replies; 16+ messages in thread
From: Alexandre TORGUE @ 2016-09-06 16:45 UTC (permalink / raw)
To: Maxime Coquelin, Thomas Gleixner, Jason Cooper, Marc Zyngier,
Linus Walleij, Mark Rutland, Rob Herring, linux-gpio, arnd
Cc: linux-arm-kernel, linux-kernel, devicetree, Daniel Thompson,
bruherrera, lee.jones
Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
diff --git a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
index 587bffb..a0eed99 100644
--- a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
@@ -14,6 +14,9 @@ Required properies:
- #size-cells : The value of this property must be 1
- ranges : defines mapping between pin controller node (parent) to
gpio-bank node (children).
+ - interrupt-parent: phandle of the interrupt parent to which the external
+ GPIO interrupts are forwarded to.
+ - st,syscfg: phandle of the syscfg node used for IRQ mux selection.
- pins-are-numbered: Specify the subnodes are using numbered pinmux to
specify pins.
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v4 6/9] pinctrl: Add IRQ support to STM32 gpios
2016-09-06 16:45 [PATCH v4 0/9] Add STM32 EXTI interrupt controller support Alexandre TORGUE
` (3 preceding siblings ...)
2016-09-06 16:45 ` [PATCH v4 5/9] Documentation: dt-bindings: Add IRQ related properties of STM32 pinctrl Alexandre TORGUE
@ 2016-09-06 16:45 ` Alexandre TORGUE
2016-09-07 21:06 ` Linus Walleij
2016-09-06 16:45 ` [PATCH v4 7/9] ARM: dts: Add GPIO irq support to STM2F429 Alexandre TORGUE
` (2 subsequent siblings)
7 siblings, 1 reply; 16+ messages in thread
From: Alexandre TORGUE @ 2016-09-06 16:45 UTC (permalink / raw)
To: Maxime Coquelin, Thomas Gleixner, Jason Cooper, Marc Zyngier,
Linus Walleij, Mark Rutland, Rob Herring, linux-gpio, arnd
Cc: linux-arm-kernel, linux-kernel, devicetree, Daniel Thompson,
bruherrera, lee.jones
This patch adds IRQ support to STM32 gpios.
The EXTI controller has 16 lines dedicated to GPIOs.
EXTI line n can be connected to only line n of one of the GPIO ports, for
example EXTI0 can be connected to either PA0, or PB0, or PC0...
This port selection is done by specifying the port number into System
Config registers.
Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
diff --git a/drivers/pinctrl/stm32/Kconfig b/drivers/pinctrl/stm32/Kconfig
index 4c40dae..40d5abc 100644
--- a/drivers/pinctrl/stm32/Kconfig
+++ b/drivers/pinctrl/stm32/Kconfig
@@ -6,6 +6,8 @@ config PINCTRL_STM32
select PINMUX
select GENERIC_PINCONF
select GPIOLIB
+ select GPIOLIB_IRQCHIP
+ select MFD_SYSCON
config PINCTRL_STM32F429
bool "STMicroelectronics STM32F429 pin control" if COMPILE_TEST && !MACH_STM32F429
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 4ae596b..9154bca 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -8,6 +8,8 @@
#include <linux/clk.h>
#include <linux/gpio/driver.h>
#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/mfd/syscon.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_address.h>
@@ -20,6 +22,7 @@
#include <linux/pinctrl/pinctrl.h>
#include <linux/pinctrl/pinmux.h>
#include <linux/platform_device.h>
+#include <linux/regmap.h>
#include <linux/reset.h>
#include <linux/slab.h>
@@ -40,6 +43,7 @@
#define STM32_GPIO_AFRH 0x24
#define STM32_GPIO_PINS_PER_BANK 16
+#define STM32_GPIO_IRQ_LINE 16
#define gpio_range_to_bank(chip) \
container_of(chip, struct stm32_gpio_bank, range)
@@ -65,6 +69,7 @@ struct stm32_gpio_bank {
spinlock_t lock;
struct gpio_chip gpio_chip;
struct pinctrl_gpio_range range;
+ struct fwnode_handle *fwnode;
};
struct stm32_pinctrl {
@@ -77,6 +82,9 @@ struct stm32_pinctrl {
struct stm32_gpio_bank *banks;
unsigned nbanks;
const struct stm32_pinctrl_match_data *match_data;
+ struct irq_domain *domain;
+ struct regmap *regmap;
+ struct regmap_field *irqmux[STM32_GPIO_PINS_PER_BANK];
};
static inline int stm32_gpio_pin(int gpio)
@@ -174,6 +182,20 @@ static int stm32_gpio_direction_output(struct gpio_chip *chip,
return 0;
}
+
+static int stm32_gpio_to_irq(struct gpio_chip *chip, unsigned int offset)
+{
+ struct stm32_gpio_bank *bank = gpiochip_get_data(chip);
+ struct irq_fwspec fwspec;
+
+ fwspec.fwnode = bank->fwnode;
+ fwspec.param_count = 2;
+ fwspec.param[0] = offset;
+ fwspec.param[1] = IRQ_TYPE_NONE;
+
+ return irq_create_fwspec_mapping(&fwspec);
+}
+
static struct gpio_chip stm32_gpio_template = {
.request = stm32_gpio_request,
.free = stm32_gpio_free,
@@ -181,10 +203,92 @@ static struct gpio_chip stm32_gpio_template = {
.set = stm32_gpio_set,
.direction_input = stm32_gpio_direction_input,
.direction_output = stm32_gpio_direction_output,
+ .to_irq = stm32_gpio_to_irq,
};
-/* Pinctrl functions */
+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,
+};
+
+static int stm32_gpio_domain_translate(struct irq_domain *d,
+ struct irq_fwspec *fwspec,
+ unsigned long *hwirq,
+ unsigned int *type)
+{
+ if ((fwspec->param_count != 2) ||
+ (fwspec->param[0] >= STM32_GPIO_IRQ_LINE))
+ return -EINVAL;
+
+ *hwirq = fwspec->param[0];
+ *type = fwspec->param[1];
+ return 0;
+}
+static void stm32_gpio_domain_activate(struct irq_domain *d,
+ struct irq_data *irq_data)
+{
+ struct stm32_gpio_bank *bank = d->host_data;
+ struct stm32_pinctrl *pctl = dev_get_drvdata(bank->gpio_chip.parent);
+
+ regmap_field_write(pctl->irqmux[irq_data->hwirq], bank->range.id);
+}
+
+static int stm32_gpio_domain_alloc(struct irq_domain *d,
+ unsigned int virq,
+ 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;
+ parent_fwspec.param_count = 2;
+ parent_fwspec.param[0] = fwspec->param[0];
+ parent_fwspec.param[1] = fwspec->param[1];
+
+ 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);
+}
+
+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,
+ .activate = stm32_gpio_domain_activate,
+};
+
+/* Pinctrl functions */
static struct stm32_pinctrl_group *
stm32_pctrl_find_group_by_pin(struct stm32_pinctrl *pctl, u32 pin)
{
@@ -857,6 +961,17 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl,
range->pin_base = range->base = range->id * STM32_GPIO_PINS_PER_BANK;
range->npins = bank->gpio_chip.ngpio;
range->gc = &bank->gpio_chip;
+
+ /* create irq hierarchical domain */
+ bank->fwnode = of_node_to_fwnode(np);
+
+ bank->gpio_chip.irqdomain = irq_domain_create_hierarchy(pctl->domain,
+ 0, STM32_GPIO_IRQ_LINE, bank->fwnode,
+ &stm32_gpio_domain_ops, bank);
+
+ if (!bank->gpio_chip.irqdomain)
+ return -ENODEV;
+
err = gpiochip_add_data(&bank->gpio_chip, bank);
if (err) {
dev_err(dev, "Failed to add gpiochip(%d)!\n", bank_nr);
@@ -867,6 +982,47 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl,
return 0;
}
+static int stm32_pctrl_dt_setup_irq(struct platform_device *pdev,
+ struct stm32_pinctrl *pctl)
+{
+ struct device_node *np = pdev->dev.of_node, *parent;
+ struct device *dev = &pdev->dev;
+ struct regmap *rm;
+ int offset, ret, i;
+
+ parent = of_irq_find_parent(np);
+ if (!parent)
+ return -ENXIO;
+
+ pctl->domain = irq_find_host(parent);
+ if (!pctl->domain)
+ return -ENXIO;
+
+ pctl->regmap = syscon_regmap_lookup_by_phandle(np, "st,syscfg");
+ if (IS_ERR(pctl->regmap))
+ return PTR_ERR(pctl->regmap);
+
+ rm = pctl->regmap;
+
+ ret = of_property_read_u32_index(np, "st,syscfg", 1, &offset);
+ if (ret)
+ return ret;
+
+ for (i = 0; i < STM32_GPIO_PINS_PER_BANK; i++) {
+ struct reg_field mux;
+
+ mux.reg = offset + (i / 4) * 4;
+ mux.lsb = (i % 4) * 4;
+ mux.msb = mux.lsb + 3;
+
+ pctl->irqmux[i] = devm_regmap_field_alloc(dev, rm, mux);
+ if (IS_ERR(pctl->irqmux[i]))
+ return PTR_ERR(pctl->irqmux[i]);
+ }
+
+ return 0;
+}
+
static int stm32_pctrl_build_state(struct platform_device *pdev)
{
struct stm32_pinctrl *pctl = platform_get_drvdata(pdev);
@@ -935,6 +1091,10 @@ int stm32_pctl_probe(struct platform_device *pdev)
return -EINVAL;
}
+ ret = stm32_pctrl_dt_setup_irq(pdev, pctl);
+ if (ret)
+ return ret;
+
for_each_child_of_node(np, child)
if (of_property_read_bool(child, "gpio-controller"))
banks++;
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH v4 6/9] pinctrl: Add IRQ support to STM32 gpios
2016-09-06 16:45 ` [PATCH v4 6/9] pinctrl: Add IRQ support to STM32 gpios Alexandre TORGUE
@ 2016-09-07 21:06 ` Linus Walleij
[not found] ` <CACRpkdZ_r0phJeScTYs_LmEHavcjGo6YjHPEHo-rKAv+rLgiFg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 16+ messages in thread
From: Linus Walleij @ 2016-09-07 21:06 UTC (permalink / raw)
To: Alexandre TORGUE
Cc: Maxime Coquelin, Thomas Gleixner, Jason Cooper, Marc Zyngier,
Mark Rutland, Rob Herring, linux-gpio@vger.kernel.org,
Arnd Bergmann, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
Daniel Thompson, Bruno Herrera, Lee Jones
On Tue, Sep 6, 2016 at 6:45 PM, Alexandre TORGUE
<alexandre.torgue@st.com> wrote:
> This patch adds IRQ support to STM32 gpios.
>
> The EXTI controller has 16 lines dedicated to GPIOs.
> EXTI line n can be connected to only line n of one of the GPIO ports, for
> example EXTI0 can be connected to either PA0, or PB0, or PC0...
> This port selection is done by specifying the port number into System
> Config registers.
>
> Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
> Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
> +++ b/drivers/pinctrl/stm32/Kconfig
> @@ -6,6 +6,8 @@ config PINCTRL_STM32
> select PINMUX
> select GENERIC_PINCONF
> select GPIOLIB
> + select GPIOLIB_IRQCHIP
But you're not really using GPIOLIB_IRQCHIP. You have a different,
super-complex irqchip in use.
So just don't select this.
> + bank->gpio_chip.irqdomain = irq_domain_create_hierarchy(pctl->domain,
> + 0, STM32_GPIO_IRQ_LINE, bank->fwnode,
> + &stm32_gpio_domain_ops, bank);
Don't use that irqdomain pointer inside the gpio_chip.
Instead declare the irqdomain pointer inside struct stm32_gpio_bank
or something like that.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v4 7/9] ARM: dts: Add GPIO irq support to STM2F429
2016-09-06 16:45 [PATCH v4 0/9] Add STM32 EXTI interrupt controller support Alexandre TORGUE
` (4 preceding siblings ...)
2016-09-06 16:45 ` [PATCH v4 6/9] pinctrl: Add IRQ support to STM32 gpios Alexandre TORGUE
@ 2016-09-06 16:45 ` Alexandre TORGUE
[not found] ` <1473180341-1999-1-git-send-email-alexandre.torgue-qxv4g6HH51o@public.gmane.org>
2016-09-06 16:45 ` [PATCH v4 9/9] ARM: config: Enable GPIO Key driver in stm32_defconfig Alexandre TORGUE
7 siblings, 0 replies; 16+ messages in thread
From: Alexandre TORGUE @ 2016-09-06 16:45 UTC (permalink / raw)
To: Maxime Coquelin, Thomas Gleixner, Jason Cooper, Marc Zyngier,
Linus Walleij, Mark Rutland, Rob Herring, linux-gpio, arnd
Cc: linux-arm-kernel, linux-kernel, devicetree, Daniel Thompson,
bruherrera, lee.jones
Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
index 1a189d4..6824762 100644
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -189,6 +189,8 @@
#size-cells = <1>;
compatible = "st,stm32f429-pinctrl";
ranges = <0 0x40020000 0x3000>;
+ interrupt-parent = <&exti>;
+ st,syscfg = <&syscfg 0x8>;
pins-are-numbered;
gpioa: gpio@40020000 {
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread[parent not found: <1473180341-1999-1-git-send-email-alexandre.torgue-qxv4g6HH51o@public.gmane.org>]
* [PATCH v4 1/9] Documentation: dt-bindings: Document STM32 EXTI controller bindings
[not found] ` <1473180341-1999-1-git-send-email-alexandre.torgue-qxv4g6HH51o@public.gmane.org>
@ 2016-09-06 16:45 ` Alexandre TORGUE
2016-09-06 16:45 ` [PATCH v4 8/9] ARM: dts: Declare push button as GPIO key on stm32f429 boards Alexandre TORGUE
1 sibling, 0 replies; 16+ messages in thread
From: Alexandre TORGUE @ 2016-09-06 16:45 UTC (permalink / raw)
To: Maxime Coquelin, Thomas Gleixner, Jason Cooper, Marc Zyngier,
Linus Walleij, Mark Rutland, Rob Herring,
linux-gpio-u79uwXL29TY76Z2rM5mHXA, arnd-r2nGTMty4D4
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA, Daniel Thompson,
bruherrera-Re5JQEeQqe8AvxtiuMwx3w,
lee.jones-QSEj5FYQhm4dnm+yROfE0A
Signed-off-by: Maxime Coquelin <mcoquelin.stm32-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Signed-off-by: Alexandre TORGUE <alexandre.torgue-qxv4g6HH51o@public.gmane.org>
diff --git a/Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt b/Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt
new file mode 100644
index 0000000..6e7703d
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/st,stm32-exti.txt
@@ -0,0 +1,20 @@
+STM32 External Interrupt Controller
+
+Required properties:
+
+- compatible: Should be "st,stm32-exti"
+- reg: Specifies base physical address and size of the registers
+- interrupt-controller: Indentifies the node as an interrupt controller
+- #interrupt-cells: Specifies the number of cells to encode an interrupt
+ specifier, shall be 2
+- interrupts: interrupts references to primary interrupt controller
+
+Example:
+
+exti: interrupt-controller@40013c00 {
+ compatible = "st,stm32-exti";
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ reg = <0x40013C00 0x400>;
+ interrupts = <1>, <2>, <3>, <6>, <7>, <8>, <9>, <10>, <23>, <40>, <41>, <42>, <62>, <76>;
+};
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v4 8/9] ARM: dts: Declare push button as GPIO key on stm32f429 boards
[not found] ` <1473180341-1999-1-git-send-email-alexandre.torgue-qxv4g6HH51o@public.gmane.org>
2016-09-06 16:45 ` [PATCH v4 1/9] Documentation: dt-bindings: Document STM32 EXTI controller bindings Alexandre TORGUE
@ 2016-09-06 16:45 ` Alexandre TORGUE
1 sibling, 0 replies; 16+ messages in thread
From: Alexandre TORGUE @ 2016-09-06 16:45 UTC (permalink / raw)
To: Maxime Coquelin, Thomas Gleixner, Jason Cooper, Marc Zyngier,
Linus Walleij, Mark Rutland, Rob Herring,
linux-gpio-u79uwXL29TY76Z2rM5mHXA, arnd-r2nGTMty4D4
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
devicetree-u79uwXL29TY76Z2rM5mHXA, Daniel Thompson,
bruherrera-Re5JQEeQqe8AvxtiuMwx3w,
lee.jones-QSEj5FYQhm4dnm+yROfE0A
Signed-off-by: Maxime Coquelin <mcoquelin.stm32-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Signed-off-by: Alexandre TORGUE <alexandre.torgue-qxv4g6HH51o@public.gmane.org>
diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts
index 6bfc595..0fd78e4 100644
--- a/arch/arm/boot/dts/stm32429i-eval.dts
+++ b/arch/arm/boot/dts/stm32429i-eval.dts
@@ -47,6 +47,7 @@
/dts-v1/;
#include "stm32f429.dtsi"
+#include <dt-bindings/input/input.h>
/ {
model = "STMicroelectronics STM32429i-EVAL board";
@@ -82,6 +83,23 @@
};
};
+ gpio_keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ autorepeat;
+ button@0 {
+ label = "Wake up";
+ linux,code = <KEY_WAKEUP>;
+ gpios = <&gpioa 0 0>;
+ };
+ button@1 {
+ label = "Tamper";
+ linux,code = <KEY_RESTART>;
+ gpios = <&gpioc 13 0>;
+ };
+ };
+
usbotg_hs_phy: usbphy {
#phy-cells = <0>;
compatible = "usb-nop-xceiv";
diff --git a/arch/arm/boot/dts/stm32f429-disco.dts b/arch/arm/boot/dts/stm32f429-disco.dts
index 0140807..7d0415e 100644
--- a/arch/arm/boot/dts/stm32f429-disco.dts
+++ b/arch/arm/boot/dts/stm32f429-disco.dts
@@ -47,6 +47,7 @@
/dts-v1/;
#include "stm32f429.dtsi"
+#include <dt-bindings/input/input.h>
/ {
model = "STMicroelectronics STM32F429i-DISCO board";
@@ -75,6 +76,18 @@
linux,default-trigger = "heartbeat";
};
};
+
+ gpio_keys {
+ compatible = "gpio-keys";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ autorepeat;
+ button@0 {
+ label = "User";
+ linux,code = <KEY_HOME>;
+ gpios = <&gpioa 0 0>;
+ };
+ };
};
&clk_hse {
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v4 9/9] ARM: config: Enable GPIO Key driver in stm32_defconfig
2016-09-06 16:45 [PATCH v4 0/9] Add STM32 EXTI interrupt controller support Alexandre TORGUE
` (6 preceding siblings ...)
[not found] ` <1473180341-1999-1-git-send-email-alexandre.torgue-qxv4g6HH51o@public.gmane.org>
@ 2016-09-06 16:45 ` Alexandre TORGUE
7 siblings, 0 replies; 16+ messages in thread
From: Alexandre TORGUE @ 2016-09-06 16:45 UTC (permalink / raw)
To: Maxime Coquelin, Thomas Gleixner, Jason Cooper, Marc Zyngier,
Linus Walleij, Mark Rutland, Rob Herring, linux-gpio, arnd
Cc: linux-arm-kernel, linux-kernel, devicetree, Daniel Thompson,
bruherrera, lee.jones
Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>
diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig
index 1e5ec2a..e7b56d4 100644
--- a/arch/arm/configs/stm32_defconfig
+++ b/arch/arm/configs/stm32_defconfig
@@ -38,7 +38,11 @@ CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_FW_LOADER is not set
# CONFIG_BLK_DEV is not set
CONFIG_EEPROM_93CX6=y
-# CONFIG_INPUT is not set
+# CONFIG_INPUT_LEDS is not set
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
# CONFIG_SERIO is not set
# CONFIG_VT is not set
# CONFIG_UNIX98_PTYS is not set
--
1.9.1
^ permalink raw reply related [flat|nested] 16+ messages in thread