Unverified Commit 756a6150 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: IPC Abstraction for FW loading 

Merge series from Ranjani Sridharan <ranjani.sridharan@linux.intel.com>:

This series introduces IPC abstraction for FW loading in the SOF driver
in preparation for supporting the new IPC version in the SOF firmware.
parents 66727cdb 1dd4b999

sound/soc/sof/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


snd-sof-objs := core.o ops.o loader.o ipc.o pcm.o pm.o debug.o topology.o\

		control.o trace.o iomem-utils.o sof-audio.o stream-ipc.o\

		ipc3-topology.o ipc3.o ipc3-control.o ipc3-pcm.o

		ipc3-topology.o ipc3-control.o ipc3.o ipc3-pcm.o ipc3-loader.o

ifneq ($(CONFIG_SND_SOC_SOF_CLIENT),)

snd-sof-objs += sof-client.o

endif

sound/soc/sof/amd/renoir.c

+0 −3
Original line number Diff line number Diff line
@@ -136,9 +136,6 @@ struct snd_sof_dsp_ops sof_renoir_ops = { 
	.block_read		= acp_dsp_block_read,

	.block_write		= acp_dsp_block_write,



	/* Module loading */

	.load_module		= snd_sof_parse_module_memcpy,



	/*Firmware loading */

	.load_firmware		= snd_sof_load_firmware_memcpy,

	.pre_fw_run		= acp_dsp_pre_fw_run,

sound/soc/sof/imx/imx8.c

+2 −4
Original line number Diff line number Diff line
@@ -510,9 +510,8 @@ static struct snd_sof_dsp_ops sof_imx8_ops = { 
	.ipc_msg_data	= sof_ipc_msg_data,

	.set_stream_data_offset = sof_set_stream_data_offset,



	/* module loading */

	.load_module	= snd_sof_parse_module_memcpy,

	.get_bar_index	= imx8_get_bar_index,



	/* firmware loading */

	.load_firmware	= snd_sof_load_firmware_memcpy,
@@ -572,9 +571,8 @@ static struct snd_sof_dsp_ops sof_imx8x_ops = { 
	.ipc_msg_data	= sof_ipc_msg_data,

	.set_stream_data_offset = sof_set_stream_data_offset,



	/* module loading */

	.load_module	= snd_sof_parse_module_memcpy,

	.get_bar_index	= imx8_get_bar_index,



	/* firmware loading */

	.load_firmware	= snd_sof_load_firmware_memcpy,

sound/soc/sof/imx/imx8m.c

+1 −2
Original line number Diff line number Diff line
@@ -436,9 +436,8 @@ static struct snd_sof_dsp_ops sof_imx8m_ops = { 
	.ipc_msg_data	= sof_ipc_msg_data,

	.set_stream_data_offset = sof_set_stream_data_offset,



	/* module loading */

	.load_module	= snd_sof_parse_module_memcpy,

	.get_bar_index	= imx8m_get_bar_index,



	/* firmware loading */

	.load_firmware	= snd_sof_load_firmware_memcpy,

sound/soc/sof/intel/bdw.c

+0 −3
Original line number Diff line number Diff line
@@ -613,9 +613,6 @@ static struct snd_sof_dsp_ops sof_bdw_ops = { 
	.pcm_open	= sof_stream_pcm_open,

	.pcm_close	= sof_stream_pcm_close,



	/* Module loading */

	.load_module    = snd_sof_parse_module_memcpy,



	/*Firmware loading */

	.load_firmware	= snd_sof_load_firmware_memcpy,