From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
Jarkko Nikula <jarkko.nikula@linux.intel.com>,
Liam Girdwood <lgirdwood@gmail.com>
Subject: [PATCH 3/7] ASoC: max98090: Reset codec on resume
Date: Fri, 16 May 2014 16:55:21 +0300 [thread overview]
Message-ID: <1400248525-21900-4-git-send-email-jarkko.nikula@linux.intel.com> (raw)
In-Reply-To: <1400248525-21900-1-git-send-email-jarkko.nikula@linux.intel.com>
From: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Make sure we reset codec and clear any IRQs on resume. This matches
the init sequence in probe.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
sound/soc/codecs/max98090.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 4accf9ba447e..b3f447cc050c 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2392,9 +2392,32 @@ static int max98090_runtime_suspend(struct device *dev)
}
#endif
+#ifdef CONFIG_PM
+static int max98090_resume(struct device *dev)
+{
+ struct max98090_priv *max98090 = dev_get_drvdata(dev);
+ unsigned int status;
+
+ max98090_reset(max98090);
+
+ /* clear IRQ status */
+ regmap_read(max98090->regmap, M98090_REG_DEVICE_STATUS, &status);
+
+ regcache_sync(max98090->regmap);
+
+ return 0;
+}
+
+static int max98090_suspend(struct device *dev)
+{
+ return 0;
+}
+#endif
+
static const struct dev_pm_ops max98090_pm = {
SET_RUNTIME_PM_OPS(max98090_runtime_suspend,
max98090_runtime_resume, NULL)
+ SET_SYSTEM_SLEEP_PM_OPS(max98090_suspend, max98090_resume)
};
static const struct i2c_device_id max98090_i2c_id[] = {
--
2.0.0.rc0
next prev parent reply other threads:[~2014-05-16 13:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-16 13:55 [PATCH 0/7] ASoC: max98090: Couple improvements and ACPI probing support Jarkko Nikula
2014-05-16 13:55 ` [PATCH 1/7] ASoC: max98090: Fix digital sidetone gain TLV Jarkko Nikula
2014-05-16 13:55 ` [PATCH 2/7] ASoC: max98090: Fix reset at resume time Jarkko Nikula
2014-05-16 13:55 ` Jarkko Nikula [this message]
2014-05-16 13:55 ` [PATCH 4/7] ASoC: max98090: Mark cache as dirty prior to restoring Jarkko Nikula
2014-05-16 13:55 ` [PATCH 5/7] ASoC: max98090: Make sure we configure BCLK in one place Jarkko Nikula
2014-05-16 13:55 ` [PATCH 6/7] ASoC: max98090: Move microphone bias voltage setting to probe function Jarkko Nikula
2014-05-16 13:55 ` [PATCH 7/7] ASoC: max98090: Add ACPI probing support Jarkko Nikula
2014-05-16 19:01 ` [PATCH 0/7] ASoC: max98090: Couple improvements and " Mark Brown
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=1400248525-21900-4-git-send-email-jarkko.nikula@linux.intel.com \
--to=jarkko.nikula@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=liam.r.girdwood@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