diff options
| author | Tarun Kanti DebBarma <tarun.kanti@ti.com> | 2012-03-02 12:52:52 +0530 |
|---|---|---|
| committer | Tarun Kanti DebBarma <tarun.kanti@ti.com> | 2012-03-20 15:29:52 +0530 |
| commit | 2c836f7ea5e7b5eec2a798e02b1d76ea791fa094 (patch) | |
| tree | 27c9f53b677bcea98198a0eb196b13af1d32dd9d /drivers/gpio | |
| parent | 8276536cec38bc6bde30d0aa67716f22b9b9705a (diff) | |
| download | linux-2c836f7ea5e7b5eec2a798e02b1d76ea791fa094.tar.gz linux-2c836f7ea5e7b5eec2a798e02b1d76ea791fa094.tar.bz2 linux-2c836f7ea5e7b5eec2a798e02b1d76ea791fa094.zip | |
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>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-omap.c | 7 |
1 files changed, 5 insertions, 2 deletions
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); } |