ASoC: WM8994: Ensure late enable events are processed for the ADCs
Subsystems (3)
PATCH v2 1/1 ASoC: WM8994: Ensure late enable events are processed for the ADCs
Ensure that the ADCs are provided with a clock as the previous patch "ASoC: WM8994: Improve playback robustness" did not handle this case properly.
Signed-off-by Dimitris Papastamos <[email protected]>
--- sound/soc/codecs/wm8994.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-)
sound/soc/codecs/wm8994.c +23 -3
@@ -1095,6 +1095,13 @@ static int aif2clk_ev(struct snd_soc_dapm_widget *w,return 0 ; } +static int adc_mux_ev (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *kcontrol,int event) +{ +late_enable_ev (w, kcontrol, event); +return 0 ; +} +static int dac_ev (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) {
@@ -1415,6 +1422,18 @@ SND_SOC_DAPM_DAC("DAC1L", NULL, WM8994_POWER_MANAGEMENT_5, 1, 0), SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0), }; +static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = { +SND_SOC_DAPM_MUX_E ("ADCL Mux" ,WM8994_POWER_MANAGEMENT_4 ,1 ,0 , &adcl_mux, + adc_mux_ev,SND_SOC_DAPM_PRE_PMU ), +SND_SOC_DAPM_MUX_E ("ADCR Mux" ,WM8994_POWER_MANAGEMENT_4 ,0 ,0 , &adcr_mux, + adc_mux_ev,SND_SOC_DAPM_PRE_PMU ), +}; + +static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = { +SND_SOC_DAPM_MUX ("ADCL Mux" ,WM8994_POWER_MANAGEMENT_4 ,1 ,0 , &adcl_mux), +SND_SOC_DAPM_MUX ("ADCR Mux" ,WM8994_POWER_MANAGEMENT_4 ,0 ,0 , &adcr_mux), +}; +static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = {SND_SOC_DAPM_INPUT ("DMIC1DAT" ),SND_SOC_DAPM_INPUT ("DMIC2DAT" ),
@@ -1509,9 +1528,6 @@ SND_SOC_DAPM_ADC("DMIC1R", NULL, WM8994_POWER_MANAGEMENT_4, 2, 0),SND_SOC_DAPM_ADC ("ADCL" ,NULL ,SND_SOC_NOPM ,1 ,0 ),SND_SOC_DAPM_ADC ("ADCR" ,NULL ,SND_SOC_NOPM ,0 ,0 ), -SND_SOC_DAPM_MUX ("ADCL Mux" ,WM8994_POWER_MANAGEMENT_4 ,1 ,0 , &adcl_mux), -SND_SOC_DAPM_MUX ("ADCR Mux" ,WM8994_POWER_MANAGEMENT_4 ,0 ,0 , &adcr_mux), -SND_SOC_DAPM_MUX ("Left Headphone Mux" ,SND_SOC_NOPM ,0 ,0 , &hpl_mux), SND_SOC_DAPM_MUX("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &hpr_mux),
@@ -3282,11 +3298,15 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)if (wm8994->revision <4 ) {snd_soc_dapm_new_controls (dapm, wm8994_lateclk_revd_widgets,ARRAY_SIZE (wm8994_lateclk_revd_widgets)); +snd_soc_dapm_new_controls (dapm, wm8994_adc_revd_widgets, +ARRAY_SIZE (wm8994_adc_revd_widgets));snd_soc_dapm_new_controls (dapm, wm8994_dac_revd_widgets,ARRAY_SIZE (wm8994_dac_revd_widgets)); }else {snd_soc_dapm_new_controls (dapm, wm8994_lateclk_widgets,ARRAY_SIZE (wm8994_lateclk_widgets)); +snd_soc_dapm_new_controls (dapm, wm8994_adc_widgets, +ARRAY_SIZE (wm8994_adc_widgets));snd_soc_dapm_new_controls (dapm, wm8994_dac_widgets,ARRAY_SIZE (wm8994_dac_widgets)); }
Signature · 1 line
1.7.4.1