aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorTim Harvey <tharvey@gateworks.com>2017-09-08 11:56:59 -0700
committerJohn Crispin <john@phrozen.org>2017-09-11 17:03:21 +0200
commit79366b81945d38ce1afd0bca867a0a457e0605f9 (patch)
tree4cc4a5d58a948681fe5b35951c8b7553dcfa793b /target/linux/cns3xxx
parentd5b7215e3144c32893e7bc44056bac1e217dd9f3 (diff)
downloadupstream-79366b81945d38ce1afd0bca867a0a457e0605f9.tar.gz
upstream-79366b81945d38ce1afd0bca867a0a457e0605f9.tar.bz2
upstream-79366b81945d38ce1afd0bca867a0a457e0605f9.zip
cns3xxx: fix GPIO controller interrupt enable
The cns3xxx interrupt controller uses a single register and as such the 'mask' reg/functions must be used as opposed to the 'enable'/'disable' reg/functions. This fixes an issue that occurs if more than one GPIO on a specific controller (there is GPIOA and GPIOB each having 32 GPIO's) uses interrupts. When one would get enabled all others would be disabled prior to this patch. Signed-off-by: Tim Harvey <tharvey@gateworks.com> Acked-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r--target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/gpio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/gpio.c b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/gpio.c
index 19de24c349..bdf930a79e 100644
--- a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/gpio.c
+++ b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/gpio.c
@@ -273,10 +273,10 @@ void __init cns3xxx_gpio_init(int gpio_base, int ngpio,
ct = gc->chip_types;
ct->type = IRQ_TYPE_EDGE_FALLING;
ct->regs.ack = GPIO_INTERRUPT_CLEAR;
- ct->regs.enable = GPIO_INTERRUPT_ENABLE;
ct->chip.irq_ack = irq_gc_ack_set_bit;
- ct->chip.irq_enable = irq_gc_unmask_enable_reg;
- ct->chip.irq_disable = irq_gc_mask_disable_reg;
+ ct->regs.mask = GPIO_INTERRUPT_ENABLE;
+ ct->chip.irq_enable = irq_gc_mask_set_bit;
+ ct->chip.irq_disable = irq_gc_mask_clr_bit;
ct->chip.irq_set_type = cns3xxx_gpio_irq_set_type;
ct->handler = handle_edge_irq;