[PATCH] orion-gpio: enable IRQ_GC_MASK_CACHE_PER_TYPE

From: Gerlando Falauto
Date: Wed Oct 02 2013 - 08:39:40 EST


enable handling of separate mask registers for Orion SoC GPIOs,
fixing indeed the regression introduced by e59347a
"arm: orion: Use generic irq chip".

Reported-by: Joey Oravec <joravec@xxxxxxxxxxxx>
Signed-off-by: Holger Brunck <holger.brunck@xxxxxxxxxxx>
Signed-off-by: Gerlando Falauto <gerlando.falauto@xxxxxxxxxxx>
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Cc: Simon Guinot <sguinot@xxxxxxxxx>
---
#Cc: <stable@xxxxxxxxxxxxxxx> # 3.0.x cfeaa93 genirq: Generic chip: Remove the local cur_regs() function
#Cc: <stable@xxxxxxxxxxxxxxx> # 3.0.x 899f0e6 genirq: Generic chip: Add support for per chip type mask cache
#Cc: <stable@xxxxxxxxxxxxxxx> # 3.0.x af80b0f genirq: Generic chip: Handle separate mask registers
#Cc: <stable@xxxxxxxxxxxxxxx> # 3.0.x
arch/arm/plat-orion/gpio.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index ebc0934..0b9f7c3 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -583,7 +583,8 @@ void __init orion_gpio_init(struct device_node *np,
ct->handler = handle_edge_irq;
ct->chip.name = ochip->chip.label;

- irq_setup_generic_chip(gc, IRQ_MSK(ngpio), IRQ_GC_INIT_MASK_CACHE,
+ irq_setup_generic_chip(gc, IRQ_MSK(ngpio), IRQ_GC_INIT_MASK_CACHE |
+ IRQ_GC_MASK_CACHE_PER_TYPE,
IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);

/* Setup irq domain on top of the generic chip. */
--
1.8.0.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/