public inbox for linux-clk@vger.kernel.org
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <mturquette@baylibre.com>, <sboyd@codeaurora.org>,
	<tony@atomide.com>, <lee.jones@linaro.org>, <robh+dt@kernel.org>,
	<lgirdwood@gmail.com>, <broonie@kernel.org>
Cc: <t-kristo@ti.com>, <linux-kernel@vger.kernel.org>,
	<linux-clk@vger.kernel.org>, <linux-omap@vger.kernel.org>,
	<devicetree@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<alsa-devel@alsa-project.org>
Subject: [PATCH 13/14] ASoC: omap-mcpdm: Support for suspend resume
Date: Wed, 18 May 2016 16:46:35 +0300	[thread overview]
Message-ID: <1463579196-5484-14-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1463579196-5484-1-git-send-email-peter.ujfalusi@ti.com>

Implement ASoC's suspend and resume callbacks.
Since McPDM does not use pcm_trigger for start and stop of the stream due
to strict sequencing needs with the twl6040, the callbacks will stop and
restart the McPDM in case the board suspended during audio activity.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 sound/soc/omap/omap-mcpdm.c | 46 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 11bd07cdce22..74d6e6fdcfd0 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -66,6 +66,9 @@ struct omap_mcpdm {
 	/* McPDM needs to be restarted due to runtime reconfiguration */
 	bool restart;
 
+	/* pm state for suspend/resume handling */
+	int pm_active_count;
+
 	struct snd_dmaengine_dai_dma_data dma_data[2];
 };
 
@@ -422,12 +425,55 @@ static int omap_mcpdm_remove(struct snd_soc_dai *dai)
 	return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int omap_mcpdm_suspend(struct snd_soc_dai *dai)
+{
+	struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai);
+
+	if (dai->active) {
+		omap_mcpdm_stop(mcpdm);
+		omap_mcpdm_close_streams(mcpdm);
+	}
+
+	mcpdm->pm_active_count = 0;
+	while (pm_runtime_active(mcpdm->dev)) {
+		pm_runtime_put_sync(mcpdm->dev);
+		mcpdm->pm_active_count++;
+	}
+
+	return 0;
+}
+
+static int omap_mcpdm_resume(struct snd_soc_dai *dai)
+{
+	struct omap_mcpdm *mcpdm = snd_soc_dai_get_drvdata(dai);
+
+	if (mcpdm->pm_active_count) {
+		while (mcpdm->pm_active_count--)
+			pm_runtime_get_sync(mcpdm->dev);
+
+		if (dai->active) {
+			omap_mcpdm_open_streams(mcpdm);
+			omap_mcpdm_start(mcpdm);
+		}
+	}
+
+
+	return 0;
+}
+#else
+#define omap_mcpdm_suspend NULL
+#define omap_mcpdm_resume NULL
+#endif
+
 #define OMAP_MCPDM_RATES	(SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
 #define OMAP_MCPDM_FORMATS	SNDRV_PCM_FMTBIT_S32_LE
 
 static struct snd_soc_dai_driver omap_mcpdm_dai = {
 	.probe = omap_mcpdm_probe,
 	.remove = omap_mcpdm_remove,
+	.suspend = omap_mcpdm_suspend,
+	.resume = omap_mcpdm_resume,
 	.probe_order = SND_SOC_COMP_ORDER_LATE,
 	.remove_order = SND_SOC_COMP_ORDER_EARLY,
 	.playback = {
-- 
2.8.2

  parent reply	other threads:[~2016-05-18 13:46 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-18 13:46 [PATCH 00/14] clk/mfd/ASoC/ARM: OMAP4/5: McPDM/twl6040 pdmclk support Peter Ujfalusi
2016-05-18 13:46 ` [PATCH 01/14] clk: twl6040: Correct clk_ops Peter Ujfalusi
2016-05-18 13:46 ` [PATCH 02/14] clk: twl6040: Register the clock as of_clk_provider Peter Ujfalusi
2016-05-18 13:46 ` [PATCH 03/14] clk: twl6040: Rename the driver and use consistent names in the code Peter Ujfalusi
2016-05-18 13:46 ` [PATCH 04/14] mfd: twl6040: The chip does not support bulk access Peter Ujfalusi
2016-05-18 13:46 ` [PATCH 05/14] mfd: twl6040: Register child device for twl6040-pdmclk Peter Ujfalusi
2016-05-18 23:30   ` Rob Herring
2016-05-18 13:46 ` [PATCH 06/14] ARM: dts: omap5-board-common: Add pdmclk binding for audio Peter Ujfalusi
2016-05-18 13:46 ` [PATCH 07/14] ARM: dts: omap4-panda-common: " Peter Ujfalusi
2016-05-18 13:46 ` [PATCH 08/14] ARM: dts: omap4-sdp: " Peter Ujfalusi
2016-05-18 13:46 ` [PATCH 09/14] ARM: dts: omap4-var-som-om44: " Peter Ujfalusi
2016-05-18 13:46 ` [PATCH 10/14] ARM: dts: omap4-duovero: " Peter Ujfalusi
2016-05-18 13:46 ` [PATCH 11/14] ASoC: omap: Kconfig: SND_OMAP_SOC_OMAP_ABE_TWL6040 to select CLK_TWL6040 Peter Ujfalusi
2016-05-18 13:46 ` [PATCH 12/14] ASoC: omap-mcpdm: Move the WD enable write inside omap_mcpdm_open_streams() Peter Ujfalusi
2016-05-18 13:46 ` Peter Ujfalusi [this message]
2016-05-18 13:46 ` [PATCH 14/14] ASoC: omap-mcpdm: Add support for pdmclk clock handling Peter Ujfalusi
2016-05-18 23:31   ` Rob Herring
2016-05-27 20:31   ` 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=1463579196-5484-14-git-send-email-peter.ujfalusi@ti.com \
    --to=peter.ujfalusi@ti.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=lee.jones@linaro.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=mturquette@baylibre.com \
    --cc=robh+dt@kernel.org \
    --cc=sboyd@codeaurora.org \
    --cc=t-kristo@ti.com \
    --cc=tony@atomide.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