diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-04 20:42:39 (GMT) |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-04 20:42:39 (GMT) |
commit | 09269e4eefcdfcb8b27b3dd1783a1a7b916c5e17 (patch) | |
tree | a6f145b6364e16c07044462f0e72d5913f0a0985 | |
parent | 9d22fd3ca7dba0027a3f121d0ba525f65f8b13fb (diff) | |
parent | de251d773bb214fa5e7666a0da1225528e07da5e (diff) | |
download | linux-09269e4eefcdfcb8b27b3dd1783a1a7b916c5e17.tar.xz |
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
-rw-r--r-- | sound/soc/intel/sst-atom-controls.h | 2 | ||||
-rw-r--r-- | sound/soc/intel/sst/sst.c | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sound/soc/intel/sst-atom-controls.h b/sound/soc/intel/sst-atom-controls.h index dfebfdd..daecc58 100644 --- a/sound/soc/intel/sst-atom-controls.h +++ b/sound/soc/intel/sst-atom-controls.h @@ -150,7 +150,7 @@ enum sst_cmd_type { enum sst_task { SST_TASK_SBA = 1, - SST_TASK_MMX, + SST_TASK_MMX = 3, }; enum sst_type { diff --git a/sound/soc/intel/sst/sst.c b/sound/soc/intel/sst/sst.c index 8a8d56a..11c5786 100644 --- a/sound/soc/intel/sst/sst.c +++ b/sound/soc/intel/sst/sst.c @@ -350,7 +350,9 @@ static inline void sst_save_shim64(struct intel_sst_drv *ctx, spin_lock_irqsave(&ctx->ipc_spin_lock, irq_flags); - shim_regs->imrx = sst_shim_read64(shim, SST_IMRX), + shim_regs->imrx = sst_shim_read64(shim, SST_IMRX); + shim_regs->csr = sst_shim_read64(shim, SST_CSR); + spin_unlock_irqrestore(&ctx->ipc_spin_lock, irq_flags); } @@ -367,6 +369,7 @@ static inline void sst_restore_shim64(struct intel_sst_drv *ctx, */ spin_lock_irqsave(&ctx->ipc_spin_lock, irq_flags); sst_shim_write64(shim, SST_IMRX, shim_regs->imrx), + sst_shim_write64(shim, SST_CSR, shim_regs->csr), spin_unlock_irqrestore(&ctx->ipc_spin_lock, irq_flags); } @@ -379,6 +382,10 @@ void sst_configure_runtime_pm(struct intel_sst_drv *ctx) * initially active. So change the state to active before * enabling the pm */ + + if (!acpi_disabled) + pm_runtime_set_active(ctx->dev); + pm_runtime_enable(ctx->dev); if (acpi_disabled) @@ -409,6 +416,7 @@ static int intel_sst_runtime_suspend(struct device *dev) synchronize_irq(ctx->irq_num); flush_workqueue(ctx->post_msg_wq); + ctx->ops->reset(ctx); /* save the shim registers because PMC doesn't save state */ sst_save_shim64(ctx, ctx->shim, ctx->shim_regs64); |