ASoC: cs42l51: add dac mux widget in codec routes
authorOlivier Moysan <olivier.moysan@st.com>
Tue, 3 Dec 2019 14:16:27 +0000 (15:16 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 9 Dec 2019 18:35:19 +0000 (18:35 +0000)
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: Olivier Moysan <olivier.moysan@st.com>
Link: https://lore.kernel.org/r/20191203141627.29471-1-olivier.moysan@st.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/cs42l51.c

index 55408c8..e47758e 100644 (file)
@@ -214,12 +214,10 @@ 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,
-               cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
-       SND_SOC_DAPM_DAC_E("Right DAC", "Right HiFi Playback",
-               CS42L51_POWER_CTL1, 6, 1,
-               cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
+       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", NULL, CS42L51_POWER_CTL1, 6, 1,
+                          cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD),
 
        /* analog/mic */
        SND_SOC_DAPM_INPUT("AIN1L"),
@@ -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"},