diff options
| author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2014-08-11 13:15:36 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-11 14:40:23 +0200 |
| commit | 27d3f02689cce5c4063a4f8dd88ce19d08a33fe6 (patch) | |
| tree | 09629de1ab39712f0cc59cf2adbbfee60537e204 /sound/soc/intel/sst-baytrail-ipc.h | |
| parent | ASoC: Intel: Update Baytrail ADSP firmware name (diff) | |
| download | linux-27d3f02689cce5c4063a4f8dd88ce19d08a33fe6.tar.xz linux-27d3f02689cce5c4063a4f8dd88ce19d08a33fe6.zip | |
ASoC: Intel: Merge Baytrail ADSP suspend_noirq into suspend_late
Merge DSP reset and cleanup sequence in sst_byt_pcm_dev_suspend_noirq()
into sst_byt_pcm_dev_suspend_late(). First their order was wrong by first
unloading firmware modules in suspend_late and then taking DSP into reset
in suspend_noirq. Second ACPI has put device into OFF state already during
suspend_late so trying to reset the DSP is a no-op at suspend_noirq stage.
Fix these by moving DSP reset and cleanup into
sst_byt_pcm_dev_suspend_late() before firmware unloading.
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: Borun Fu <borun.fu@intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/intel/sst-baytrail-ipc.h')
| -rw-r--r-- | sound/soc/intel/sst-baytrail-ipc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/intel/sst-baytrail-ipc.h b/sound/soc/intel/sst-baytrail-ipc.h index 06a4d202689b..8faff6dcf25d 100644 --- a/sound/soc/intel/sst-baytrail-ipc.h +++ b/sound/soc/intel/sst-baytrail-ipc.h @@ -66,7 +66,6 @@ int sst_byt_get_dsp_position(struct sst_byt *byt, int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata); void sst_byt_dsp_free(struct device *dev, struct sst_pdata *pdata); struct sst_dsp *sst_byt_get_dsp(struct sst_byt *byt); -int sst_byt_dsp_suspend_noirq(struct device *dev, struct sst_pdata *pdata); int sst_byt_dsp_suspend_late(struct device *dev, struct sst_pdata *pdata); int sst_byt_dsp_boot(struct device *dev, struct sst_pdata *pdata); int sst_byt_dsp_wait_for_ready(struct device *dev, struct sst_pdata *pdata); |