devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: olivier moysan <olivier.moysan@st.com>
To: lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz,
	tiwai@suse.com, mcoquelin.stm32@gmail.com,
	alexandre.torgue@st.com, alsa-devel@alsa-project.org,
	robh@kernel.org, mark.rutland@arm.com,
	devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	kernel@stlinux.com, linux-kernel@vger.kernel.org,
	olivier.moysan@st.com
Cc: arnaud.pouliquen@st.com, benjamin.gaignard@st.com
Subject: [PATCH 7/7] ASoC: stm32: sai: manage master clock
Date: Fri, 16 Jun 2017 14:15:34 +0200	[thread overview]
Message-ID: <1497615334-7156-8-git-send-email-olivier.moysan@st.com> (raw)
In-Reply-To: <1497615334-7156-1-git-send-email-olivier.moysan@st.com>

Disable master clock by default, and activate
it only when requested.

Signed-off-by: olivier moysan <olivier.moysan@st.com>
---
 sound/soc/stm/stm32_sai_sub.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c
index 2466af0..ce48c02 100644
--- a/sound/soc/stm/stm32_sai_sub.c
+++ b/sound/soc/stm/stm32_sai_sub.c
@@ -220,8 +220,15 @@ static int stm32_sai_set_sysclk(struct snd_soc_dai *cpu_dai,
 				int clk_id, unsigned int freq, int dir)
 {
 	struct stm32_sai_sub_data *sai = snd_soc_dai_get_drvdata(cpu_dai);
+	int ret;
 
 	if ((dir == SND_SOC_CLOCK_OUT) && sai->master) {
+		ret = regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX,
+					 SAI_XCR1_NODIV,
+					 (unsigned int)~SAI_XCR1_NODIV);
+		if (ret < 0)
+			return ret;
+
 		sai->mclk_rate = freq;
 		dev_dbg(cpu_dai->dev, "SAI MCLK frequency is %uHz\n", freq);
 	}
@@ -356,6 +363,10 @@ static int stm32_sai_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
 	}
 	cr1_mask |= SAI_XCR1_SLAVE;
 
+	/* do not generate master by default */
+	cr1 |= SAI_XCR1_NODIV;
+	cr1_mask |= SAI_XCR1_NODIV;
+
 	ret = regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, cr1_mask, cr1);
 	if (ret < 0) {
 		dev_err(cpu_dai->dev, "Failed to update CR1 register\n");
@@ -652,6 +663,9 @@ static void stm32_sai_shutdown(struct snd_pcm_substream *substream,
 
 	regmap_update_bits(sai->regmap, STM_SAI_IMR_REGX, SAI_XIMR_MASK, 0);
 
+	regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, SAI_XCR1_NODIV,
+			   SAI_XCR1_NODIV);
+
 	clk_disable_unprepare(sai->sai_ck);
 	sai->substream = NULL;
 }
-- 
1.9.1

  parent reply	other threads:[~2017-06-16 12:15 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-16 12:15 [PATCH 0/7] ASoC: stm32: sai: misc fixes olivier moysan
2017-06-16 12:15 ` [PATCH 1/7] dt-bindings: stm32: sai: fix DT example olivier moysan
     [not found]   ` <1497615334-7156-2-git-send-email-olivier.moysan-qxv4g6HH51o@public.gmane.org>
2017-06-16 17:49     ` Mark Brown
2017-06-16 17:50   ` Applied "dt-bindings: stm32: sai: fix DT example" to the asoc tree Mark Brown
2017-06-16 12:15 ` [PATCH 2/7] ASoC: stm32: change SAI configuration flag olivier moysan
2017-06-16 17:49   ` Mark Brown
2017-06-19  8:51     ` Olivier MOYSAN
2017-06-16 12:15 ` [PATCH 3/7] ASoC: stm32: sai: typo fixes olivier moysan
2017-06-16 17:50   ` Applied "ASoC: stm32: sai: typo fixes" to the asoc tree Mark Brown
2017-06-16 12:15 ` [PATCH 4/7] ASoC: stm32: sai: remove spurious trace olivier moysan
2017-06-16 17:50   ` Applied "ASoC: stm32: sai: remove spurious trace" to the asoc tree Mark Brown
2017-06-16 12:15 ` [PATCH 5/7] ASoC: stm32: sai: change stop sequence olivier moysan
     [not found]   ` <1497615334-7156-6-git-send-email-olivier.moysan-qxv4g6HH51o@public.gmane.org>
2017-06-16 17:49     ` Applied "ASoC: stm32: sai: change stop sequence" to the asoc tree Mark Brown
2017-06-16 12:15 ` [PATCH 6/7] ASoC: stm32: sai: fix clock management olivier moysan
2017-06-16 17:49   ` Applied "ASoC: stm32: sai: fix clock management" to the asoc tree Mark Brown
2017-06-16 12:15 ` olivier moysan [this message]
2017-06-16 17:49   ` Applied "ASoC: stm32: sai: manage master clock" " 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=1497615334-7156-8-git-send-email-olivier.moysan@st.com \
    --to=olivier.moysan@st.com \
    --cc=alexandre.torgue@st.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=arnaud.pouliquen@st.com \
    --cc=benjamin.gaignard@st.com \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=kernel@stlinux.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mcoquelin.stm32@gmail.com \
    --cc=perex@perex.cz \
    --cc=robh@kernel.org \
    --cc=tiwai@suse.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;
as well as URLs for NNTP newsgroup(s).