Commit 57e6ef38a4a7e4329f185dbd382bcee1da6196a9
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
Showing 2 changed files Side-by-side Diff
MAINTAINERS
| ... | ... | @@ -4953,6 +4953,16 @@ |
| 4953 | 4953 | F: drivers/input/input-mt.c |
| 4954 | 4954 | K: \b(ABS|SYN)_MT_ |
| 4955 | 4955 | |
| 4956 | +INTEL ASoC BDW/HSW DRIVERS | |
| 4957 | +M: Jie Yang <yang.jie@linux.intel.com> | |
| 4958 | +L: alsa-devel@alsa-project.org | |
| 4959 | +S: Supported | |
| 4960 | +F: sound/soc/intel/sst-haswell* | |
| 4961 | +F: sound/soc/intel/sst-dsp* | |
| 4962 | +F: sound/soc/intel/sst-firmware.c | |
| 4963 | +F: sound/soc/intel/broadwell.c | |
| 4964 | +F: sound/soc/intel/haswell.c | |
| 4965 | + | |
| 4956 | 4966 | INTEL C600 SERIES SAS CONTROLLER DRIVER |
| 4957 | 4967 | M: Intel SCU Linux support <intel-linux-scu@intel.com> |
| 4958 | 4968 | M: Artur Paszkiewicz <artur.paszkiewicz@intel.com> |
sound/soc/intel/sst-haswell-ipc.c
| ... | ... | @@ -651,11 +651,11 @@ |
| 651 | 651 | } |
| 652 | 652 | |
| 653 | 653 | /* tell DSP that notification has been handled */ |
| 654 | - sst_dsp_shim_update_bits_unlocked(hsw->dsp, SST_IPCD, | |
| 654 | + sst_dsp_shim_update_bits(hsw->dsp, SST_IPCD, | |
| 655 | 655 | SST_IPCD_BUSY | SST_IPCD_DONE, SST_IPCD_DONE); |
| 656 | 656 | |
| 657 | 657 | /* unmask busy interrupt */ |
| 658 | - sst_dsp_shim_update_bits_unlocked(hsw->dsp, SST_IMRX, SST_IMRX_BUSY, 0); | |
| 658 | + sst_dsp_shim_update_bits(hsw->dsp, SST_IMRX, SST_IMRX_BUSY, 0); | |
| 659 | 659 | } |
| 660 | 660 | |
| 661 | 661 | static struct ipc_message *reply_find_msg(struct sst_hsw *hsw, u32 header) |