aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthilnathan Veppur <senthilnathanx.veppur@intel.com>2016-06-13 08:29:00 -0400
committerMark Brown <broonie@kernel.org>2016-06-14 09:59:33 -0400
commit316f135a4ec6fba2a53930f843a0c1c5d4ae1ea2 (patch)
tree89f1f60f9c7a3e615373376b77a625b42f8c935b
parent4cdf33feb2c67ef1ff45bc5160b261b8c1fd2428 (diff)
ASoC: Intel: Update ignore suspend for bxt-rt298
Capture from DMIC requires that we ignore the suspend, so mark these as ignore_suspend in bxt-rt298 machine. Signed-off-by: Senthilnathan Veppur <senthilnathanx.veppur@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/intel/boards/bxt_rt298.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c
index 10eb5cbf57e4..8b956500414b 100644
--- a/sound/soc/intel/boards/bxt_rt298.c
+++ b/sound/soc/intel/boards/bxt_rt298.c
@@ -106,6 +106,17 @@ static const struct snd_soc_dapm_route broxton_rt298_map[] = {
106 106
107}; 107};
108 108
109static int broxton_rt298_fe_init(struct snd_soc_pcm_runtime *rtd)
110{
111 struct snd_soc_dapm_context *dapm;
112 struct snd_soc_component *component = rtd->cpu_dai->component;
113
114 dapm = snd_soc_component_get_dapm(component);
115 snd_soc_dapm_ignore_suspend(dapm, "Reference Capture");
116
117 return 0;
118}
119
109static int broxton_rt298_codec_init(struct snd_soc_pcm_runtime *rtd) 120static int broxton_rt298_codec_init(struct snd_soc_pcm_runtime *rtd)
110{ 121{
111 struct snd_soc_codec *codec = rtd->codec; 122 struct snd_soc_codec *codec = rtd->codec;
@@ -120,6 +131,9 @@ static int broxton_rt298_codec_init(struct snd_soc_pcm_runtime *rtd)
120 return ret; 131 return ret;
121 132
122 rt298_mic_detect(codec, &broxton_headset); 133 rt298_mic_detect(codec, &broxton_headset);
134
135 snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");
136
123 return 0; 137 return 0;
124} 138}
125 139
@@ -267,6 +281,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
267 .dynamic = 1, 281 .dynamic = 1,
268 .codec_name = "snd-soc-dummy", 282 .codec_name = "snd-soc-dummy",
269 .codec_dai_name = "snd-soc-dummy-dai", 283 .codec_dai_name = "snd-soc-dummy-dai",
284 .init = broxton_rt298_fe_init,
270 .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, 285 .trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
271 .dpcm_playback = 1, 286 .dpcm_playback = 1,
272 .ops = &broxton_rt286_fe_ops, 287 .ops = &broxton_rt286_fe_ops,