ASoC: Intel: Allow byt-5640 machine driver and SST core go to suspend

Since there is no support for compressed audio in Baytrail ADSP firmware
there is no need to leave it on during suspend since ALSA PCM buffers are
too small for leaving ADSP on for playing or recording.

Implement PM callbacks to Baytrail byt-rt5640.c machine driver that call
snd_soc_suspend and snd_soc_resume functions and unset the ignore_suspend
fields in DAI links.

This makes soc-core and ALSA core gracefully suspend and resume active
stream and call sst_byt_pcm_trigger() during suspend-resume cycle.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c
index eff97c8e52184ac25ad1cea57a3a7b2f57327730..9061616f0f45ee9b1eac8d83bb3c746e09a678f6 100644 (file)
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@ -124,7 +124,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBS_CFS,
                .init = byt_rt5640_init,
-               .ignore_suspend = 1,
                .ops = &byt_rt5640_ops,
        },
        {
@@ -137,7 +136,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
                           SND_SOC_DAIFMT_CBS_CFS,
                .init = NULL,
-               .ignore_suspend = 1,
                .ops = &byt_rt5640_ops,
        },
 };
@@ -152,6 +150,17 @@ static struct snd_soc_card byt_rt5640_card = {
        .num_dapm_routes = ARRAY_SIZE(byt_rt5640_audio_map),
 };
 
+#ifdef CONFIG_PM_SLEEP
+static const struct dev_pm_ops byt_rt5640_pm_ops = {
+       .suspend = snd_soc_suspend,
+       .resume = snd_soc_resume,
+};
+
+#define BYT_RT5640_PM_OPS      (&byt_rt5640_pm_ops)
+#else
+#define BYT_RT5640_PM_OPS      NULL
+#endif
+
 static int byt_rt5640_probe(struct platform_device *pdev)
 {
        struct snd_soc_card *card = &byt_rt5640_card;
@@ -177,6 +186,7 @@ static struct platform_driver byt_rt5640_audio = {
        .driver = {
                .name = "byt-rt5640",
                .owner = THIS_MODULE,
+               .pm = BYT_RT5640_PM_OPS,
        },
 };
 module_platform_driver(byt_rt5640_audio)