diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-06-22 19:44:18 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-06-22 16:01:05 +0100 |
| commit | 45a9e0753153907b1a5141377295daf5483805b7 (patch) | |
| tree | 4c5cad81379d6a2ac7eba91b68e22f388003a0f1 /sound/soc/intel/boards/bxt_rt298.c | |
| parent | c3f2fe621af70ee5e52803eb779c7eca29fad0d0 (diff) | |
| download | linux-0-day-45a9e0753153907b1a5141377295daf5483805b7.tar.gz linux-0-day-45a9e0753153907b1a5141377295daf5483805b7.tar.xz | |
ASoC: Intel: Revert "ASoC: Intel: Add support for PM ops in bxt-rt298"
This reverts commit 3513798ca4bc ("ASoC: Intel: Add support for
PM ops in bxt-rt298") as the right way to fix this is to disable
async suspend
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards/bxt_rt298.c')
| -rw-r--r-- | sound/soc/intel/boards/bxt_rt298.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c index 2ef33b113bb5d..8b956500414ba 100644 --- a/sound/soc/intel/boards/bxt_rt298.c +++ b/sound/soc/intel/boards/bxt_rt298.c @@ -454,33 +454,10 @@ static int broxton_audio_probe(struct platform_device *pdev) return devm_snd_soc_register_card(&pdev->dev, &broxton_rt298); } -/* - * we want the card to be suspend first and then platform driver. This - * allows the DAPM to tear down pipelines on suspend and then platform shuts - * down the DSP. For this use .prepare for suspending card - * - * Similarly, use complete to let DSP download firmware first and then sync - * DAPM and restore pipelines to DSP - */ -static void broxton_rt298_complete(struct device *dev) -{ - snd_soc_resume(dev); -} - -static const struct dev_pm_ops broxton_pm_ops = { - .prepare = snd_soc_suspend, - .complete = broxton_rt298_complete, - .freeze = snd_soc_suspend, - .thaw = snd_soc_resume, - .poweroff = snd_soc_poweroff, - .restore = snd_soc_resume, -}; - static struct platform_driver broxton_audio = { .probe = broxton_audio_probe, .driver = { .name = "bxt_alc298s_i2s", - .pm = &broxton_pm_ops, }, }; module_platform_driver(broxton_audio) |