Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

gpio: mxs: use enable/disable regs to (un)mask irqs

The mxs gpio controller does not only have a mask register to mask
interrupts, but also enable/disable registers. Use the enable/disable
registers rather than the mask register. This does not have any
advantage for now, but makes the next patch simpler.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Marek Vasut <marex@denx.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Sascha Hauer and committed by
Linus Walleij
66a37c3b 4035cc15

+4 -3
+4 -3
drivers/gpio/gpio-mxs.c
··· 211 211 212 212 ct = gc->chip_types; 213 213 ct->chip.irq_ack = irq_gc_ack_set_bit; 214 - ct->chip.irq_mask = irq_gc_mask_clr_bit; 215 - ct->chip.irq_unmask = irq_gc_mask_set_bit; 214 + ct->chip.irq_mask = irq_gc_mask_disable_reg; 215 + ct->chip.irq_unmask = irq_gc_unmask_enable_reg; 216 216 ct->chip.irq_set_type = mxs_gpio_set_irq_type; 217 217 ct->chip.irq_set_wake = mxs_gpio_set_wake_irq; 218 218 ct->regs.ack = PINCTRL_IRQSTAT(port) + MXS_CLR; 219 - ct->regs.mask = PINCTRL_IRQEN(port); 219 + ct->regs.enable = PINCTRL_IRQEN(port) + MXS_SET; 220 + ct->regs.disable = PINCTRL_IRQEN(port) + MXS_CLR; 220 221 221 222 irq_setup_generic_chip(gc, IRQ_MSK(32), IRQ_GC_INIT_NESTED_LOCK, 222 223 IRQ_NOREQUEST, 0);