diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-29 09:55:40 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-07-08 18:33:29 -0400 |
commit | 1a2017b7143d9d0ec1b75078e76c6f55a2e55d17 (patch) | |
tree | 0cb31f397e84afbeb95852b2e821fb1ac67115b3 | |
parent | ed393dcd419fd2a00d33cd169dded7303e1c0968 (diff) |
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>
-rw-r--r-- | drivers/mfd/wm8994-core.c | 7 |
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) | |||
293 | if (ret != 0) | 293 | if (ret != 0) |
294 | dev_err(dev, "Failed to restore GPIO registers: %d\n", ret); | 294 | dev_err(dev, "Failed to restore GPIO registers: %d\n", ret); |
295 | 295 | ||
296 | /* In case one of the GPIOs is used as a wake input. */ | ||
297 | ret = regcache_sync_region(wm8994->regmap, | ||
298 | WM8994_INTERRUPT_STATUS_1_MASK, | ||
299 | WM8994_INTERRUPT_STATUS_1_MASK); | ||
300 | if (ret != 0) | ||
301 | dev_err(dev, "Failed to restore interrupt mask: %d\n", ret); | ||
302 | |||
296 | regcache_cache_only(wm8994->regmap, true); | 303 | regcache_cache_only(wm8994->regmap, true); |
297 | wm8994->suspended = true; | 304 | wm8994->suspended = true; |
298 | 305 | ||