]> Pileus Git - ~andy/linux/commitdiff
gpio/omap: save and restore debounce registers
authorNishanth Menon <nm@ti.com>
Fri, 9 Sep 2011 13:38:58 +0000 (19:08 +0530)
committerTarun Kanti DebBarma <tarun.kanti@ti.com>
Mon, 6 Feb 2012 11:24:37 +0000 (16:54 +0530)
GPIO debounce registers need to be saved and restored for proper functioning
of driver.

Signed-off-by: Nishanth Menon <nm@ti.com>
tarun.kanti@ti.com: Debounce context save is moved to _set_gpio_debounce()
as part of dynamic context save to remove overhead.
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>
drivers/gpio/gpio-omap.c

index 62c49e0f7f2945093fc24de71d8cdc80416debfb..f6b2c51b29354bcd19bcc286ec2bff79ac6ae8a3 100644 (file)
@@ -44,6 +44,8 @@ struct gpio_regs {
        u32 risingdetect;
        u32 fallingdetect;
        u32 dataout;
+       u32 debounce;
+       u32 debounce_en;
 };
 
 struct gpio_bank {
@@ -229,6 +231,10 @@ static void _set_gpio_debounce(struct gpio_bank *bank, unsigned gpio,
         * that point. Therefore we have to enable dbck here.
         */
        _gpio_dbck_enable(bank);
+       if (bank->dbck_enable_mask) {
+               bank->context.debounce = debounce;
+               bank->context.debounce_en = val;
+       }
 }
 
 static inline void set_gpio_trigger(struct gpio_bank *bank, int gpio,
@@ -1363,6 +1369,12 @@ static void omap_gpio_restore_context(struct gpio_bank *bank)
        __raw_writel(bank->context.fallingdetect,
                                bank->base + bank->regs->fallingdetect);
        __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout);
+       if (bank->dbck_enable_mask) {
+               __raw_writel(bank->context.debounce, bank->base +
+                                       bank->regs->debounce);
+               __raw_writel(bank->context.debounce_en,
+                                       bank->base + bank->regs->debounce_en);
+       }
 }
 #endif /* CONFIG_PM_RUNTIME */
 #else