Unverified Commit 6062ecda authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: IPC4: Add topology, control and PCM ops 

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

This set of patches includes changes to add the topology, control and
PCM ops for IPC4. It also includes a couple of patches to set the IPC4
BE DAI trigger ops for SSP/DMIC/HDA type DAI's.
parents 9f1c8677 a45a4d43

include/sound/sof.h

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ struct sof_dev_desc { 


	struct snd_sof_dsp_ops *ops;

	int (*ops_init)(struct snd_sof_dev *sdev);

	void (*ops_free)(struct snd_sof_dev *sdev);

};



int sof_dai_get_mclk(struct snd_soc_pcm_runtime *rtd);

include/uapi/sound/sof/abi.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#ifndef __INCLUDE_UAPI_SOUND_SOF_ABI_H__

#define __INCLUDE_UAPI_SOUND_SOF_ABI_H__



#include <linux/types.h>



/* SOF ABI version major, minor and patch numbers */

#define SOF_ABI_MAJOR 3

#define SOF_ABI_MINOR 21

include/uapi/sound/sof/header.h

+30 −0
Original line number Diff line number Diff line
@@ -26,4 +26,34 @@ struct sof_abi_hdr { 
	__u32 data[0];		/**< Component data - opaque to core */

}  __packed;



#define SOF_MANIFEST_DATA_TYPE_NHLT 1



/**

 * struct sof_manifest_tlv - SOF manifest TLV data

 * @type: type of data

 * @size: data size (not including the size of this struct)

 * @data: payload data

 */

struct sof_manifest_tlv {

	__le32 type;

	__le32 size;

	__u8 data[];

};



/**

 * struct sof_manifest - SOF topology manifest

 * @abi_major: Major ABI version

 * @abi_minor: Minor ABI version

 * @abi_patch: ABI patch

 * @count: count of tlv items

 * @items: consecutive variable size tlv items

 */

struct sof_manifest {

	__le16 abi_major;

	__le16 abi_minor;

	__le16 abi_patch;

	__le16 count;

	struct sof_manifest_tlv items[];

};



#endif

include/uapi/sound/sof/tokens.h

+40 −0
Original line number Diff line number Diff line
@@ -52,11 +52,17 @@ 
#define SOF_TKN_SCHED_FRAMES			204

#define SOF_TKN_SCHED_TIME_DOMAIN		205

#define SOF_TKN_SCHED_DYNAMIC_PIPELINE		206

#define SOF_TKN_SCHED_LP_MODE			207

#define SOF_TKN_SCHED_MEM_USAGE			208



/* volume */

#define SOF_TKN_VOLUME_RAMP_STEP_TYPE		250

#define SOF_TKN_VOLUME_RAMP_STEP_MS		251



#define SOF_TKN_GAIN_RAMP_TYPE			260

#define SOF_TKN_GAIN_RAMP_DURATION		261

#define SOF_TKN_GAIN_VAL			262



/* SRC */

#define SOF_TKN_SRC_RATE_IN			300

#define SOF_TKN_SRC_RATE_OUT			301
@@ -79,6 +85,9 @@ 
 */

#define SOF_TKN_COMP_CORE_ID			404

#define SOF_TKN_COMP_UUID                       405

#define SOF_TKN_COMP_CPC			406

#define SOF_TKN_COMP_IS_PAGES			409

#define SOF_TKN_COMP_NUM_AUDIO_FORMATS		410



/* SSP */

#define SOF_TKN_INTEL_SSP_CLKS_CONTROL		500
@@ -145,4 +154,35 @@ 
#define SOF_TKN_MEDIATEK_AFE_CH			1601

#define SOF_TKN_MEDIATEK_AFE_FORMAT		1602



/* MIXER */

#define SOF_TKN_MIXER_TYPE			1700



/* CAVS AUDIO FORMAT */

#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_RATE	1900

#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_BIT_DEPTH	1901

#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_VALID_BIT	1902

#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_CHANNELS	1903

#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_CH_MAP	1904

#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_CH_CFG	1905

#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_INTERLEAVING_STYLE	1906

#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_FMT_CFG	1907

#define SOF_TKN_CAVS_AUDIO_FORMAT_IN_SAMPLE_TYPE	1908

/* intentional token numbering discontinuity, reserved for future use */

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_RATE	1930

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_BIT_DEPTH	1931

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_VALID_BIT	1932

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_CHANNELS	1933

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_CH_MAP	1934

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_CH_CFG	1935

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_INTERLEAVING_STYLE	1936

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_FMT_CFG	1937

#define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_SAMPLE_TYPE	1938

/* intentional token numbering discontinuity, reserved for future use */

#define SOF_TKN_CAVS_AUDIO_FORMAT_IBS		1970

#define SOF_TKN_CAVS_AUDIO_FORMAT_OBS		1971

#define SOF_TKN_CAVS_AUDIO_FORMAT_DMA_BUFFER_SIZE	1972



/* COPIER */

#define SOF_TKN_INTEL_COPIER_NODE_TYPE		1980



#endif

sound/soc/sof/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,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-control.o ipc3.o ipc3-pcm.o ipc3-loader.o\

		ipc3-dtrace.o\

		ipc4.o ipc4-loader.o

		ipc4.o ipc4-loader.o ipc4-topology.o ipc4-control.o ipc4-pcm.o

ifneq ($(CONFIG_SND_SOC_SOF_CLIENT),)

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

endif