diff options
author | olivier moysan <olivier.moysan@st.com> | 2017-06-16 08:15:34 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-06-16 13:58:58 -0400 |
commit | 701a6ec3a3f8d30bdb45ee025fb61f7a934b6cad (patch) | |
tree | c8a028289bd0becb0b66f2fca0dff64ae9143d44 | |
parent | 1c77603136d00368b8cd7c10d1ca4bad5952a136 (diff) |
ASoC: stm32: sai: manage master clock
Disable master clock by default, and activate
it only when requested.
Signed-off-by: olivier moysan <olivier.moysan@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/stm/stm32_sai_sub.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 2466af0343db..ce48c02db051 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, | |||
220 | int clk_id, unsigned int freq, int dir) | 220 | int clk_id, unsigned int freq, int dir) |
221 | { | 221 | { |
222 | struct stm32_sai_sub_data *sai = snd_soc_dai_get_drvdata(cpu_dai); | 222 | struct stm32_sai_sub_data *sai = snd_soc_dai_get_drvdata(cpu_dai); |
223 | int ret; | ||
223 | 224 | ||
224 | if ((dir == SND_SOC_CLOCK_OUT) && sai->master) { | 225 | if ((dir == SND_SOC_CLOCK_OUT) && sai->master) { |
226 | ret = regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, | ||
227 | SAI_XCR1_NODIV, | ||
228 | (unsigned int)~SAI_XCR1_NODIV); | ||
229 | if (ret < 0) | ||
230 | return ret; | ||
231 | |||
225 | sai->mclk_rate = freq; | 232 | sai->mclk_rate = freq; |
226 | dev_dbg(cpu_dai->dev, "SAI MCLK frequency is %uHz\n", freq); | 233 | dev_dbg(cpu_dai->dev, "SAI MCLK frequency is %uHz\n", freq); |
227 | } | 234 | } |
@@ -356,6 +363,10 @@ static int stm32_sai_set_dai_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) | |||
356 | } | 363 | } |
357 | cr1_mask |= SAI_XCR1_SLAVE; | 364 | cr1_mask |= SAI_XCR1_SLAVE; |
358 | 365 | ||
366 | /* do not generate master by default */ | ||
367 | cr1 |= SAI_XCR1_NODIV; | ||
368 | cr1_mask |= SAI_XCR1_NODIV; | ||
369 | |||
359 | ret = regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, cr1_mask, cr1); | 370 | ret = regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, cr1_mask, cr1); |
360 | if (ret < 0) { | 371 | if (ret < 0) { |
361 | dev_err(cpu_dai->dev, "Failed to update CR1 register\n"); | 372 | 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, | |||
652 | 663 | ||
653 | regmap_update_bits(sai->regmap, STM_SAI_IMR_REGX, SAI_XIMR_MASK, 0); | 664 | regmap_update_bits(sai->regmap, STM_SAI_IMR_REGX, SAI_XIMR_MASK, 0); |
654 | 665 | ||
666 | regmap_update_bits(sai->regmap, STM_SAI_CR1_REGX, SAI_XCR1_NODIV, | ||
667 | SAI_XCR1_NODIV); | ||
668 | |||
655 | clk_disable_unprepare(sai->sai_ck); | 669 | clk_disable_unprepare(sai->sai_ck); |
656 | sai->substream = NULL; | 670 | sai->substream = NULL; |
657 | } | 671 | } |