evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pinctrl: pinctrl-adi2: disable IRQ when setting value

Browse source 
GPIO output value should be set after the GPIO interrupt is disabled.
Use BIT macro as well.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
[Edited commit message]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Sonic Zhang 2013-10-08 15:31:21 +08:00 • committed by Linus Walleij
parent 010c51e189
commit d3224ed140
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/pinctrl/pinctrl-adi2.c
View file

@ -766,9 +766,9 @@ static void adi_gpio_set_value(struct gpio_chip *chip, unsigned offset,
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
if (value) if (value)
writew(1 << offset, &regs->data_set); writew(BIT(offset), &regs->data_set);
else else
writew(1 << offset, &regs->data_clear); writew(BIT(offset), &regs->data_clear);
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
} }
@ -780,12 +780,14 @@ static int adi_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
struct gpio_port_t *regs = port->regs; struct gpio_port_t *regs = port->regs;
unsigned long flags; unsigned long flags;
adi_gpio_set_value(chip, offset, value);
spin_lock_irqsave(&port->lock, flags); spin_lock_irqsave(&port->lock, flags);
writew(readw(&regs->inen) & ~(1 << offset), &regs->inen); writew(readw(&regs->inen) & ~BIT(offset), &regs->inen);
writew(1 << offset, &regs->dir_set); if (value)
writew(BIT(offset), &regs->data_set);
else
writew(BIT(offset), &regs->data_clear);
writew(BIT(offset), &regs->dir_set);
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);