From: Adam Thomson Date: Tue, 22 Dec 2015 18:27:52 +0000 (+0000) Subject: UPSTREAM: ASoC: da7219: Fix Sidetone to work regardless of DAI capture X-Git-Tag: firefly_0821_release~2838 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fac23581ff8c7b41a9a9d26dadc7d344516b0b7c;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Mark Brown (cherry picked from commit fdd50a8086422caa456b5f8abb631dda6c551744) Change-Id: I167dfe2bf18d696a01b8261b0fb0bb7a7569ec21 Signed-off-by: Xing Zheng --- diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index e36a7b79b494..319e794d27f6 100644 --- 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"),