gpio/omap: handle set_dataout reg capable IP on restore

GPIO IP revisions such as those used in OMAP4 have a set_dataout
while the previous revisions used a single dataout register.
Depending on what is available restore the dataout settings
to the right register.

Signed-off-by: Nishanth Menon <nm@ti.com>
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 e0fd2e4b2b9cc83cdbf590ce2a79afacecfc0232..f49bd6f47a504b0ec732173e202f6f3dca716afd 100644 (file)
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1363,7 +1363,12 @@ static void omap_gpio_restore_context(struct gpio_bank *bank)
                                bank->base + bank->regs->risingdetect);
        __raw_writel(bank->context.fallingdetect,
                                bank->base + bank->regs->fallingdetect);
-       __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout);
+       if (bank->regs->set_dataout && bank->regs->clr_dataout)
+               __raw_writel(bank->context.dataout,
+                               bank->base + bank->regs->set_dataout);
+       else
+               __raw_writel(bank->context.dataout,
+                               bank->base + bank->regs->dataout);
        __raw_writel(bank->context.oe, bank->base + bank->regs->direction);
 
        if (bank->dbck_enable_mask) {