summaryrefslogtreecommitdiff
path: root/drivers/staging/intel_sst/intel_sst.c
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2011-07-08 08:59:26 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-08 21:02:25 (GMT)
commit26af13f15ab281c9e20f8027bc556111644662ae (patch)
treefca3d799477812ec81312f1baedbbc9bfe4b5c43 /drivers/staging/intel_sst/intel_sst.c
parent35b5ddb6466f66c511217abd8b3f490e759dae3e (diff)
downloadlinux-fsl-qoriq-26af13f15ab281c9e20f8027bc556111644662ae.tar.xz
sst: avoid unnecessary firmware reloading for MRST
SST HW on MRST doesn't need to reload the firmware during suspend/resume cycle, so remove the extra workload. This also fix a bug that the firmware sample rate can't be modified when there is no active playback/capture stream. Signed-off-by: Feng Tang <feng.tang@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/intel_sst/intel_sst.c')
-rw-r--r--drivers/staging/intel_sst/intel_sst.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/intel_sst/intel_sst.c b/drivers/staging/intel_sst/intel_sst.c
index c0c144a..d892861 100644
--- a/drivers/staging/intel_sst/intel_sst.c
+++ b/drivers/staging/intel_sst/intel_sst.c
@@ -545,7 +545,10 @@ static int intel_sst_runtime_suspend(struct device *dev)
/* Move the SST state to Suspended */
mutex_lock(&sst_drv_ctx->sst_lock);
sst_drv_ctx->sst_state = SST_SUSPENDED;
- sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
+
+ /* Only needed by Medfield */
+ if (sst_drv_ctx->pci_id != SST_MRST_PCI_ID)
+ sst_shim_write(sst_drv_ctx->shim, SST_CSR, csr.full);
mutex_unlock(&sst_drv_ctx->sst_lock);
return 0;
}