]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
mfd: Also restore wm8994 GPIO IRQ masks after reset
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 29 Jun 2012 13:55:40 +0000 (14:55 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Sun, 8 Jul 2012 22:33:29 +0000 (00:33 +0200)
This ensures that if we are using a GPIO as a wake source it continues to
function while we're suspended.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/wm8994-core.c

index 53293c742a19d760232c2104bbc0df423dd06975..eec74aa55fdfe28c46476c3360e1632bfd51cf7f 100644 (file)
@@ -293,6 +293,13 @@ static int wm8994_suspend(struct device *dev)
        if (ret != 0)
                dev_err(dev, "Failed to restore GPIO registers: %d\n", ret);
 
+       /* In case one of the GPIOs is used as a wake input. */
+       ret = regcache_sync_region(wm8994->regmap,
+                                  WM8994_INTERRUPT_STATUS_1_MASK,
+                                  WM8994_INTERRUPT_STATUS_1_MASK);
+       if (ret != 0)
+               dev_err(dev, "Failed to restore interrupt mask: %d\n", ret);
+
        regcache_cache_only(wm8994->regmap, true);
        wm8994->suspended = true;