Commit 57e6ef38 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

parents 8c617791 97fa99a3

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -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>

sound/soc/intel/sst-haswell-ipc.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE