From: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Date: Fri, 2 Mar 2012 07:22:52 +0000 (+0530)
Subject: gpio/omap: fix missing dataout context save in _set_gpio_dataout_reg
X-Git-Tag: v3.4-rc1~65^2~2^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2c836f7ea5e7b5eec2a798e02b1d76ea791fa094;p=karo-tx-linux.git

gpio/omap: fix missing dataout context save in _set_gpio_dataout_reg

There are two functions, _set_gpio_dataout_reg() and _set_gpio_dataout_mask()
which writes to dataout register and the dataout context must be saved.
It is missing in the first function, _set_gpio_dataout_reg(). Fix this.

Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Reviewed-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 8901d576cb7d..bbe964899017 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -120,10 +120,13 @@ static void _set_gpio_dataout_reg(struct gpio_bank *bank, int gpio, int enable)
 	void __iomem *reg = bank->base;
 	u32 l = GPIO_BIT(bank, gpio);
 
-	if (enable)
+	if (enable) {
 		reg += bank->regs->set_dataout;
-	else
+		bank->context.dataout |= l;
+	} else {
 		reg += bank->regs->clr_dataout;
+		bank->context.dataout &= ~l;
+	}
 
 	__raw_writel(l, reg);
 }