Unverified Commit abe3b672 authored by Olivier Moysan's avatar Olivier Moysan Committed by Mark Brown
Browse files

ASoC: cs42l51: add dac mux widget in codec routes 



Add "DAC mux" DAPM widget in CS42l51 audio codec routes,
to support DAC mux control and to remove error trace
"DAC Mux has no paths" at widget creation.
Note: ADC path of DAC mux is not routed in this patch.

Signed-off-by: default avatarOlivier Moysan <olivier.moysan@st.com>
Link: https://lore.kernel.org/r/20191203141627.29471-1-olivier.moysan@st.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 49df1e39

sound/soc/codecs/cs42l51.c

+10 −6
Original line number Diff line number Diff line
@@ -214,11 +214,9 @@ static const struct snd_soc_dapm_widget cs42l51_dapm_widgets[] = { 
	SND_SOC_DAPM_ADC_E("Right ADC", "Right HiFi Capture",

		CS42L51_POWER_CTL1, 2, 1,

		cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),

	SND_SOC_DAPM_DAC_E("Left DAC", "Left HiFi Playback",

		CS42L51_POWER_CTL1, 5, 1,

	SND_SOC_DAPM_DAC_E("Left DAC", NULL, CS42L51_POWER_CTL1, 5, 1,

			   cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),

	SND_SOC_DAPM_DAC_E("Right DAC", "Right HiFi Playback",

		CS42L51_POWER_CTL1, 6, 1,

	SND_SOC_DAPM_DAC_E("Right DAC", NULL, CS42L51_POWER_CTL1, 6, 1,

			   cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),



	/* analog/mic */
@@ -255,6 +253,12 @@ static const struct snd_soc_dapm_route cs42l51_routes[] = { 
	{"HPL", NULL, "Left DAC"},

	{"HPR", NULL, "Right DAC"},



	{"Right DAC", NULL, "DAC Mux"},

	{"Left DAC", NULL, "DAC Mux"},



	{"DAC Mux", "Direct PCM", "Playback"},

	{"DAC Mux", "DSP PCM", "Playback"},



	{"Left ADC", NULL, "Left PGA"},

	{"Right ADC", NULL, "Right PGA"},