From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-kernel@vger.kernel.org,
patches@opensource.wolfsonmicro.com,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 2/2] mfd: wm8994: Also restore GPIO IRQ masks after reset
Date: Fri, 29 Jun 2012 14:55:40 +0100 [thread overview]
Message-ID: <1340978140-11572-2-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1340978140-11572-1-git-send-email-broonie@opensource.wolfsonmicro.com>
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>
---
drivers/mfd/wm8994-core.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 53293c7..eec74aa 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;
--
1.7.10
next prev parent reply other threads:[~2012-06-29 13:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-29 13:55 [PATCH 1/2] mfd: wm8994: Use regcache_sync_region() to sync GPIO registers on suspend Mark Brown
2012-06-29 13:55 ` Mark Brown [this message]
2012-07-08 22:34 ` [PATCH 2/2] mfd: wm8994: Also restore GPIO IRQ masks after reset Samuel Ortiz
2012-07-08 22:34 ` [PATCH 1/2] mfd: wm8994: Use regcache_sync_region() to sync GPIO registers on suspend Samuel Ortiz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340978140-11572-2-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.wolfsonmicro.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome