ASoC: WM8994: Improve playback robustness
On WM8994 revision D and earlier ensure proper playback robustness as some rare use cases can trigger issues. Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@kernel.org
This commit is contained in:
parent
173efa09e4
commit
c52fd021bc
1 changed files with 52 additions and 7 deletions
|
@ -1083,6 +1083,17 @@ static int aif2clk_ev(struct snd_soc_dapm_widget *w,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int dac_ev(struct snd_soc_dapm_widget *w,
|
||||||
|
struct snd_kcontrol *kcontrol, int event)
|
||||||
|
{
|
||||||
|
struct snd_soc_codec *codec = w->codec;
|
||||||
|
unsigned int mask = 1 << w->shift;
|
||||||
|
|
||||||
|
snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,
|
||||||
|
mask, mask);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static const char *hp_mux_text[] = {
|
static const char *hp_mux_text[] = {
|
||||||
"Mixer",
|
"Mixer",
|
||||||
"DAC",
|
"DAC",
|
||||||
|
@ -1374,6 +1385,24 @@ SND_SOC_DAPM_SUPPLY("AIF1CLK", WM8994_AIF1_CLOCKING_1, 0, 0, NULL, 0),
|
||||||
SND_SOC_DAPM_SUPPLY("AIF2CLK", WM8994_AIF2_CLOCKING_1, 0, 0, NULL, 0)
|
SND_SOC_DAPM_SUPPLY("AIF2CLK", WM8994_AIF2_CLOCKING_1, 0, 0, NULL, 0)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct snd_soc_dapm_widget wm8994_dac_revd_widgets[] = {
|
||||||
|
SND_SOC_DAPM_DAC_E("DAC2L", NULL, SND_SOC_NOPM, 3, 0,
|
||||||
|
dac_ev, SND_SOC_DAPM_PRE_PMU),
|
||||||
|
SND_SOC_DAPM_DAC_E("DAC2R", NULL, SND_SOC_NOPM, 2, 0,
|
||||||
|
dac_ev, SND_SOC_DAPM_PRE_PMU),
|
||||||
|
SND_SOC_DAPM_DAC_E("DAC1L", NULL, SND_SOC_NOPM, 1, 0,
|
||||||
|
dac_ev, SND_SOC_DAPM_PRE_PMU),
|
||||||
|
SND_SOC_DAPM_DAC_E("DAC1R", NULL, SND_SOC_NOPM, 0, 0,
|
||||||
|
dac_ev, SND_SOC_DAPM_PRE_PMU),
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct snd_soc_dapm_widget wm8994_dac_widgets[] = {
|
||||||
|
SND_SOC_DAPM_DAC("DAC2L", NULL, WM8994_POWER_MANAGEMENT_5, 3, 0),
|
||||||
|
SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 2, 0),
|
||||||
|
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_dapm_widgets[] = {
|
static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = {
|
||||||
SND_SOC_DAPM_INPUT("DMIC1DAT"),
|
SND_SOC_DAPM_INPUT("DMIC1DAT"),
|
||||||
SND_SOC_DAPM_INPUT("DMIC2DAT"),
|
SND_SOC_DAPM_INPUT("DMIC2DAT"),
|
||||||
|
@ -1471,11 +1500,6 @@ 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("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("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
|
||||||
|
|
||||||
SND_SOC_DAPM_DAC("DAC2L", NULL, WM8994_POWER_MANAGEMENT_5, 3, 0),
|
|
||||||
SND_SOC_DAPM_DAC("DAC2R", NULL, WM8994_POWER_MANAGEMENT_5, 2, 0),
|
|
||||||
SND_SOC_DAPM_DAC("DAC1L", NULL, WM8994_POWER_MANAGEMENT_5, 1, 0),
|
|
||||||
SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0),
|
|
||||||
|
|
||||||
SND_SOC_DAPM_MUX("Left Headphone Mux", SND_SOC_NOPM, 0, 0, &hpl_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),
|
SND_SOC_DAPM_MUX("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &hpr_mux),
|
||||||
|
|
||||||
|
@ -2627,6 +2651,22 @@ static int wm8994_resume(struct snd_soc_codec *codec)
|
||||||
{
|
{
|
||||||
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
|
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
|
||||||
int i, ret;
|
int i, ret;
|
||||||
|
unsigned int val, mask;
|
||||||
|
|
||||||
|
if (wm8994->revision < 4) {
|
||||||
|
/* force a HW read */
|
||||||
|
val = wm8994_reg_read(codec->control_data,
|
||||||
|
WM8994_POWER_MANAGEMENT_5);
|
||||||
|
|
||||||
|
/* modify the cache only */
|
||||||
|
codec->cache_only = 1;
|
||||||
|
mask = WM8994_DAC1R_ENA | WM8994_DAC1L_ENA |
|
||||||
|
WM8994_DAC2R_ENA | WM8994_DAC2L_ENA;
|
||||||
|
val &= mask;
|
||||||
|
snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,
|
||||||
|
mask, val);
|
||||||
|
codec->cache_only = 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* Restore the registers */
|
/* Restore the registers */
|
||||||
ret = snd_soc_cache_sync(codec);
|
ret = snd_soc_cache_sync(codec);
|
||||||
|
@ -3238,12 +3278,17 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
|
||||||
case WM8994:
|
case WM8994:
|
||||||
snd_soc_dapm_new_controls(dapm, wm8994_specific_dapm_widgets,
|
snd_soc_dapm_new_controls(dapm, wm8994_specific_dapm_widgets,
|
||||||
ARRAY_SIZE(wm8994_specific_dapm_widgets));
|
ARRAY_SIZE(wm8994_specific_dapm_widgets));
|
||||||
if (wm8994->revision < 4)
|
if (wm8994->revision < 4) {
|
||||||
snd_soc_dapm_new_controls(dapm, wm8994_lateclk_revd_widgets,
|
snd_soc_dapm_new_controls(dapm, wm8994_lateclk_revd_widgets,
|
||||||
ARRAY_SIZE(wm8994_lateclk_revd_widgets));
|
ARRAY_SIZE(wm8994_lateclk_revd_widgets));
|
||||||
else
|
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,
|
snd_soc_dapm_new_controls(dapm, wm8994_lateclk_widgets,
|
||||||
ARRAY_SIZE(wm8994_lateclk_widgets));
|
ARRAY_SIZE(wm8994_lateclk_widgets));
|
||||||
|
snd_soc_dapm_new_controls(dapm, wm8994_dac_widgets,
|
||||||
|
ARRAY_SIZE(wm8994_dac_widgets));
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case WM8958:
|
case WM8958:
|
||||||
snd_soc_add_controls(codec, wm8958_snd_controls,
|
snd_soc_add_controls(codec, wm8958_snd_controls,
|
||||||
|
|
Reference in a new issue