[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1381217481-17252-1-git-send-email-sonic.adi@gmail.com>
Date: Tue, 8 Oct 2013 15:31:21 +0800
From: Sonic Zhang <sonic.adi@...il.com>
To: Linus Walleij <linus.walleij@...aro.org>,
Axel Lin <axel.lin@...ics.com>
CC: LKML <linux-kernel@...r.kernel.org>,
<adi-buildroot-devel@...ts.sourceforge.net>,
Sonic Zhang <sonic.zhang@...log.com>
Subject: [PATCH] pinctrl: pinctrl-adi2: GPIO output value should be set after the GPIO interrupt is disabled.
From: Sonic Zhang <sonic.zhang@...log.com>
Use BIT macro as well.
Signed-off-by: Sonic Zhang <sonic.zhang@...log.com>
---
drivers/pinctrl/pinctrl-adi2.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
index a74e6f4..7a39562 100644
--- a/drivers/pinctrl/pinctrl-adi2.c
+++ b/drivers/pinctrl/pinctrl-adi2.c
@@ -766,9 +766,9 @@ static void adi_gpio_set_value(struct gpio_chip *chip, unsigned offset,
spin_lock_irqsave(&port->lock, flags);
if (value)
- writew(1 << offset, ®s->data_set);
+ writew(BIT(offset), ®s->data_set);
else
- writew(1 << offset, ®s->data_clear);
+ writew(BIT(offset), ®s->data_clear);
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;
unsigned long flags;
- adi_gpio_set_value(chip, offset, value);
-
spin_lock_irqsave(&port->lock, flags);
- writew(readw(®s->inen) & ~(1 << offset), ®s->inen);
- writew(1 << offset, ®s->dir_set);
+ writew(readw(®s->inen) & ~BIT(offset), ®s->inen);
+ if (value)
+ writew(BIT(offset), ®s->data_set);
+ else
+ writew(BIT(offset), ®s->data_clear);
+ writew(BIT(offset), ®s->dir_set);
spin_unlock_irqrestore(&port->lock, flags);
--
1.8.2.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists