Commit c23bb602 authored by Russell King's avatar Russell King

MFD: ucb1x00-core: fix gpiolib direction_output handling

gpiolib drivers should first set the output data before setting the
direction to avoid putting glitches on an output signal.  As an
additional bonus, we tweak the code to avoid unnecessary register
writes to the output and direction registers if they have no need
to be updated.
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2e95e51e
...@@ -148,16 +148,22 @@ static int ucb1x00_gpio_direction_output(struct gpio_chip *chip, unsigned offset ...@@ -148,16 +148,22 @@ static int ucb1x00_gpio_direction_output(struct gpio_chip *chip, unsigned offset
{ {
struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio); struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
unsigned long flags; unsigned long flags;
unsigned old, mask = 1 << offset;
spin_lock_irqsave(&ucb->io_lock, flags); spin_lock_irqsave(&ucb->io_lock, flags);
ucb->io_dir |= (1 << offset); old = ucb->io_out;
ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir);
if (value) if (value)
ucb->io_out |= 1 << offset; ucb->io_out |= mask;
else else
ucb->io_out &= ~(1 << offset); ucb->io_out &= ~mask;
ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out);
if (old != ucb->io_out)
ucb1x00_reg_write(ucb, UCB_IO_DATA, ucb->io_out);
if (!(ucb->io_dir & mask)) {
ucb->io_dir |= mask;
ucb1x00_reg_write(ucb, UCB_IO_DIR, ucb->io_dir);
}
spin_unlock_irqrestore(&ucb->io_lock, flags); spin_unlock_irqrestore(&ucb->io_lock, flags);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment