Commit 1b86a3fa authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: ad193x: Keep DAC output stage active in idle 



Setting the DAC power-down bit for the ad193x will also disable the DAC
output amplifier. This will cause audible clicks and pops when starting or
stopping playback. To prevent this a new widget is introduced that controls
the DAC power-down bit. This widget is connected to both the DAC and a newly
introduced VMID widget. This makes sure that the DAC power-down bit is not
set as long as a audio sink is connected to the DAC output. At the same time
the PLL and SYSCLK will still be disabled when no playback or capture stream
is active.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f114040e

sound/soc/codecs/ad193x.c

+9 −5
Original line number Diff line number Diff line
@@ -72,11 +72,13 @@ static const struct snd_kcontrol_new ad193x_snd_controls[] = { 
};



static const struct snd_soc_dapm_widget ad193x_dapm_widgets[] = {

	SND_SOC_DAPM_DAC("DAC", "Playback", AD193X_DAC_CTRL0, 0, 1),

	SND_SOC_DAPM_DAC("DAC", "Playback", SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_PGA("DAC Output", AD193X_DAC_CTRL0, 0, 1, NULL, 0),

	SND_SOC_DAPM_ADC("ADC", "Capture", SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_SUPPLY("PLL_PWR", AD193X_PLL_CLK_CTRL0, 0, 1, NULL, 0),

	SND_SOC_DAPM_SUPPLY("ADC_PWR", AD193X_ADC_CTRL0, 0, 1, NULL, 0),

	SND_SOC_DAPM_SUPPLY("SYSCLK", AD193X_PLL_CLK_CTRL0, 7, 0, NULL, 0),

	SND_SOC_DAPM_VMID("VMID"),

	SND_SOC_DAPM_OUTPUT("DAC1OUT"),

	SND_SOC_DAPM_OUTPUT("DAC2OUT"),

	SND_SOC_DAPM_OUTPUT("DAC3OUT"),
@@ -87,13 +89,15 @@ static const struct snd_soc_dapm_widget ad193x_dapm_widgets[] = { 


static const struct snd_soc_dapm_route audio_paths[] = {

	{ "DAC", NULL, "SYSCLK" },

	{ "DAC Output", NULL, "DAC" },

	{ "DAC Output", NULL, "VMID" },

	{ "ADC", NULL, "SYSCLK" },

	{ "DAC", NULL, "ADC_PWR" },

	{ "ADC", NULL, "ADC_PWR" },

	{ "DAC1OUT", NULL, "DAC" },

	{ "DAC2OUT", NULL, "DAC" },

	{ "DAC3OUT", NULL, "DAC" },

	{ "DAC4OUT", NULL, "DAC" },

	{ "DAC1OUT", NULL, "DAC Output" },

	{ "DAC2OUT", NULL, "DAC Output" },

	{ "DAC3OUT", NULL, "DAC Output" },

	{ "DAC4OUT", NULL, "DAC Output" },

	{ "ADC", NULL, "ADC1IN" },

	{ "ADC", NULL, "ADC2IN" },

	{ "SYSCLK", NULL, "PLL_PWR" },

CRA Git | Maintained and supported by SUSTech CRA and CCSE