From ddca68611f938aa45ca2bab888ce2b0d040b6435 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Tue, 21 May 2019 09:31:44 +0800 Subject: [PATCH] asoc: add ignore_suspend for all BEs, BE_OUT and BE_IN During suspend on new kernel, FE/BE path would tear down and pinctrl for related component would be deactived. On kona, FM is connected to TERT MI2S and during suepend, pinctrl for TERT MI2S would be sleep state and FM has no sound. Add ignore_suspend for all BEs, BE_OUT and BE_IN to avoid tearing FE/BE path during device suspend. Change-Id: I8868f35d6c418987ffe287d64a3f5ae3d1abf1c1 Signed-off-by: Meng Wang --- asoc/msm-dai-q6-v2.c | 2 ++ asoc/msm-pcm-routing-v2.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/asoc/msm-dai-q6-v2.c b/asoc/msm-dai-q6-v2.c index 1a82d65a2650..4b85be2eb738 100644 --- a/asoc/msm-dai-q6-v2.c +++ b/asoc/msm-dai-q6-v2.c @@ -727,6 +727,7 @@ static int msm_dai_q6_dai_add_route(struct snd_soc_dai *dai) dev_dbg(dai->dev, "%s: src %s sink %s\n", __func__, intercon.source, intercon.sink); snd_soc_dapm_add_routes(dapm, &intercon, 1); + snd_soc_dapm_ignore_suspend(dapm, intercon.sink); } if (dai->driver->capture.stream_name && dai->driver->capture.aif_name) { @@ -737,6 +738,7 @@ static int msm_dai_q6_dai_add_route(struct snd_soc_dai *dai) dev_dbg(dai->dev, "%s: src %s sink %s\n", __func__, intercon.source, intercon.sink); snd_soc_dapm_add_routes(dapm, &intercon, 1); + snd_soc_dapm_ignore_suspend(dapm, intercon.source); } return 0; } diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c index f3795be8524c..474a8ddd95aa 100644 --- a/asoc/msm-pcm-routing-v2.c +++ b/asoc/msm-pcm-routing-v2.c @@ -24774,6 +24774,8 @@ static int msm_routing_probe(struct snd_soc_component *component) { snd_soc_dapm_new_controls(&component->dapm, msm_qdsp6_widgets, ARRAY_SIZE(msm_qdsp6_widgets)); + snd_soc_dapm_ignore_suspend(&component->dapm, "BE_OUT"); + snd_soc_dapm_ignore_suspend(&component->dapm, "BE_IN"); snd_soc_dapm_add_routes(&component->dapm, intercon, ARRAY_SIZE(intercon));