UPSTREAM: ASoC: da7219: Fix Sidetone to work regardless of DAI capture

Previously Sidetone would operate only when capture to DAI was in
progress, due to DAPM path configuration. There is no reason why
this should not operate without DAI capture, so this patch updates
the DAPM path accordingly.

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
(cherry picked from commit fdd50a8086422caa456b5f8abb631dda6c551744)

Change-Id: I167dfe2bf18d696a01b8261b0fb0bb7a7569ec21
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>

diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index e36a7b79b49490c95f897bc921a504aafa4aa730..319e794d27f6a6556bf5c336c6701d148d5d33fb 100644 (file)
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -968,10 +968,11 @@ static const struct snd_soc_dapm_route da7219_audio_map[] = {
        {"Mixin PGA", NULL, "Mic PGA"},
        {"ADC", NULL, "Mixin PGA"},
 
-       {"Sidetone Filter", NULL, "ADC"},
        {"Mixer In", NULL, "Mixer In Supply"},
        {"Mixer In", "Mic Switch", "ADC"},
 
+       {"Sidetone Filter", NULL, "Mixer In"},
+
        {"Tone Generator", NULL, "TONE"},
 
        DA7219_OUT_DAI_MUX_ROUTES("Out DAIL Mux"),