diff options
author | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:44 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:44 +0000 |
commit | c9ae111a20be4c9555128cced8edded660d133df (patch) | |
tree | fd4809b562d454394cbb9ec517bf3f1ef2d5b6f2 /target/linux/mvebu/patches-3.10/0182-of-irq-Pass-trigger-type-in-IRQ-resource-flags.patch | |
parent | 3af779eb172b0438f77e8a01a97dd0eb9a146076 (diff) | |
download | upstream-c9ae111a20be4c9555128cced8edded660d133df.tar.gz upstream-c9ae111a20be4c9555128cced8edded660d133df.tar.bz2 upstream-c9ae111a20be4c9555128cced8edded660d133df.zip |
mvebu: backport mainline patches from kernel 3.13
This is a backport of the patches accepted to the Linux mainline related to
mvebu SoC (Armada XP and Armada 370) between Linux v3.12, and Linux v3.13.
This work mainly covers:
* Finishes work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c)
between the PXA family, and the Armada family.
* timer initialization update, and access function for the Armada family.
* Generic IRQ handling backporting.
* Some bug fixes.
Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com>
CC: Luka Perkov <luka@openwrt.org>
SVN-Revision: 39566
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0182-of-irq-Pass-trigger-type-in-IRQ-resource-flags.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.10/0182-of-irq-Pass-trigger-type-in-IRQ-resource-flags.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0182-of-irq-Pass-trigger-type-in-IRQ-resource-flags.patch b/target/linux/mvebu/patches-3.10/0182-of-irq-Pass-trigger-type-in-IRQ-resource-flags.patch new file mode 100644 index 0000000000..5363b2e008 --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0182-of-irq-Pass-trigger-type-in-IRQ-resource-flags.patch @@ -0,0 +1,34 @@ +From 4bd60065fb935a5d390c9a442be3a18d2ea18eee Mon Sep 17 00:00:00 2001 +From: Tomasz Figa <tomasz.figa@gmail.com> +Date: Thu, 19 Dec 2013 09:30:53 -0300 +Subject: [PATCH 182/203] of/irq: Pass trigger type in IRQ resource flags + +Some drivers might rely on availability of trigger flags in IRQ +resource, for example to configure the hardware for particular interrupt +type. However current code creating IRQ resources from data in device +tree does not configure trigger flags in resulting resources. + +This patch tries to solve the problem, based on the fact that +irq_of_parse_and_map() configures the trigger based on DT interrupt +specifier and IRQD_TRIGGER_* flags are consistent with IORESOURCE_IRQ_*, +and we can get correct trigger flags by calling irqd_get_trigger_type() +after mapping the interrupt. + +Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> +[grant.likely: Merged the two assignments to r->flags] +Signed-off-by: Grant Likely <grant.likely@linaro.org> +--- + drivers/of/irq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/of/irq.c ++++ b/drivers/of/irq.c +@@ -360,7 +360,7 @@ int of_irq_to_resource(struct device_nod + &name); + + r->start = r->end = irq; +- r->flags = IORESOURCE_IRQ; ++ r->flags = IORESOURCE_IRQ | irqd_get_trigger_type(irq_get_irq_data(irq)); + r->name = name ? name : of_node_full_name(dev); + } + |