pinctrl: msm: Fix set gpio setting

Set g->out_bit bit for gpio output high, clear g->out_bit bit for gpio output
low.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c
index 011e26334077db06be5a3d3a3a9b568d14260c54..ef2bf3126da6ca0c10de2ef1a1025c1df744afc9 100644 (file)
--- a/drivers/pinctrl/pinctrl-msm.c
+++ b/drivers/pinctrl/pinctrl-msm.c
@@ -429,7 +429,12 @@ static int msm_gpio_direction_output(struct gpio_chip *chip, unsigned offset, in
 
        spin_lock_irqsave(&pctrl->lock, flags);
 
-       writel(value ? BIT(g->out_bit) : 0, pctrl->regs + g->io_reg);
+       val = readl(pctrl->regs + g->io_reg);
+       if (value)
+               val |= BIT(g->out_bit);
+       else
+               val &= ~BIT(g->out_bit);
+       writel(val, pctrl->regs + g->io_reg);
 
        val = readl(pctrl->regs + g->ctl_reg);
        val |= BIT(g->oe_bit);
@@ -468,7 +473,10 @@ static void msm_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
        spin_lock_irqsave(&pctrl->lock, flags);
 
        val = readl(pctrl->regs + g->io_reg);
-       val |= BIT(g->out_bit);
+       if (value)
+               val |= BIT(g->out_bit);
+       else
+               val &= ~BIT(g->out_bit);
        writel(val, pctrl->regs + g->io_reg);
 
        spin_unlock_irqrestore(&pctrl->lock, flags);