diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-05 19:34:10 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-05 19:34:10 +0000 |
| commit | 57e6ef38a4a7e4329f185dbd382bcee1da6196a9 (patch) | |
| tree | 9cb14cba73f493c15645acb1a2da4b590c368b86 | |
| parent | 8c617791acaf5bd59999e47e0cce94b3759f20b5 (diff) | |
| parent | 97fa99a3b8aa83c8ff17ef380dd377efac373812 (diff) | |
| download | op-kernel-dev-57e6ef38a4a7e4329f185dbd382bcee1da6196a9.zip op-kernel-dev-57e6ef38a4a7e4329f185dbd382bcee1da6196a9.tar.gz | |
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
| -rw-r--r-- | MAINTAINERS | 10 | ||||
| -rw-r--r-- | sound/soc/intel/sst-haswell-ipc.c | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aaa039d..4871639 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4953,6 +4953,16 @@ F: Documentation/input/multi-touch-protocol.txt F: drivers/input/input-mt.c K: \b(ABS|SYN)_MT_ +INTEL ASoC BDW/HSW DRIVERS +M: Jie Yang <yang.jie@linux.intel.com> +L: alsa-devel@alsa-project.org +S: Supported +F: sound/soc/intel/sst-haswell* +F: sound/soc/intel/sst-dsp* +F: sound/soc/intel/sst-firmware.c +F: sound/soc/intel/broadwell.c +F: sound/soc/intel/haswell.c + INTEL C600 SERIES SAS CONTROLLER DRIVER M: Intel SCU Linux support <intel-linux-scu@intel.com> M: Artur Paszkiewicz <artur.paszkiewicz@intel.com> diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c index 5bf1404..8156cc1 100644 --- a/sound/soc/intel/sst-haswell-ipc.c +++ b/sound/soc/intel/sst-haswell-ipc.c @@ -651,11 +651,11 @@ static void hsw_notification_work(struct work_struct *work) } /* tell DSP that notification has been handled */ - sst_dsp_shim_update_bits_unlocked(hsw->dsp, SST_IPCD, + sst_dsp_shim_update_bits(hsw->dsp, SST_IPCD, SST_IPCD_BUSY | SST_IPCD_DONE, SST_IPCD_DONE); /* unmask busy interrupt */ - sst_dsp_shim_update_bits_unlocked(hsw->dsp, SST_IMRX, SST_IMRX_BUSY, 0); + sst_dsp_shim_update_bits(hsw->dsp, SST_IMRX, SST_IMRX_BUSY, 0); } static struct ipc_message *reply_find_msg(struct sst_hsw *hsw, u32 header) |
