[alsa-devel] [RFC PATCH v2 2/2] ASoC: wm8994: delay aifxclk activation

[olivier moysan]

This patch is a draft.

The aim of this patch is to allow the following use case:
- The codec wm8994 is configured as a slave of CPU DAI
- The codec is configured before runtime
- CPU DAI provides master clock to the codec at runtime only

The wm8994 cannot be configured as long as master clock
is not provided to the codec.
aif clock, charge pump and DC servo registers are written
to the codec but are not read back at their expected values,
when the master clock is not set during configuration.
In this use case, master clock is not available before
pcm stream start.
So previous settings are failing
if there are set in SND_SOC_DAPM_PRE_PMU stage.

A way to go around this problem, is to delay aifxclk activation
until SND_SOC_DAPM_POST_PMU DAPM stage.
However delaying aif clock may have side effect on other use cases.

The purpose of this patch is to illustrate the principle of the fix
and to check if it may be applicable in all other contexts.


Signed-off-by: olivier moysan <olivier.moysan at st.com>
---
 sound/soc/codecs/wm8994.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index ccf640a..6782d9e 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -1262,7 +1262,7 @@ static int late_enable_ev(struct snd_soc_dapm_widget *w,
 	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
 
 	switch (event) {
-	case SND_SOC_DAPM_PRE_PMU:
+	case SND_SOC_DAPM_POST_PMU:
 		if (wm8994->aif1clk_enable) {
 			aif1clk_ev(w, kcontrol, SND_SOC_DAPM_PRE_PMU);
 			snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1,
@@ -1615,6 +1615,8 @@ static SOC_ENUM_SINGLE_DECL(aif2dacr_src_enum,
 SND_SOC_DAPM_MUX_E("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &wm_hubs_hpr_mux,
 		   late_enable_ev, SND_SOC_DAPM_PRE_PMU),
 
+SND_SOC_DAPM_POST("Late Enable PGA", late_enable_ev),
+
 SND_SOC_DAPM_POST("Late Disable PGA", late_disable_ev)
 };
 
-- 
1.9.1