summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-29 17:55:40 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-09 02:33:29 +0400
commit1a2017b7143d9d0ec1b75078e76c6f55a2e55d17 (patch)
tree0cb31f397e84afbeb95852b2e821fb1ac67115b3 /drivers
parented393dcd419fd2a00d33cd169dded7303e1c0968 (diff)
downloadlinux-1a2017b7143d9d0ec1b75078e76c6f55a2e55d17.tar.xz
mfd: Also restore wm8994 GPIO IRQ masks after reset
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/wm8994-core.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 53293c742a19..eec74aa55fdf 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -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;