diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h index 46b2a7e63167bb..4b5c0c3b4f3f6c 100644 --- a/include/sound/sof/topology.h +++ b/include/sound/sof/topology.h @@ -167,16 +167,6 @@ struct sof_ipc_comp_tone { int32_t ramp_step; } __packed; -/** \brief Types of processing components */ -enum sof_ipc_process_type { - SOF_PROCESS_NONE = 0, /**< None */ - SOF_PROCESS_EQFIR, /**< Intel FIR */ - SOF_PROCESS_EQIIR, /**< Intel IIR */ - SOF_PROCESS_KEYWORD_DETECT, /**< Keyword Detection */ - SOF_PROCESS_KPB, /**< KeyPhrase Buffer Manager */ - SOF_PROCESS_CHAN_SELECTOR, /**< Channel Selector */ -}; - /* generic "effect", "codec" or proprietary processing component */ struct sof_ipc_comp_process { struct sof_ipc_comp comp; @@ -247,10 +237,4 @@ struct sof_ipc_pipe_comp_connect { uint32_t sink_id; } __packed; -/* external events */ -enum sof_event_types { - SOF_EVENT_NONE = 0, - SOF_KEYWORD_DETECT_DAPM_EVENT, -}; - #endif diff --git a/include/uapi/sound/sof/abi.h b/include/uapi/sound/sof/abi.h index 13a4eca04577cb..0868eb47acf7e8 100644 --- a/include/uapi/sound/sof/abi.h +++ b/include/uapi/sound/sof/abi.h @@ -26,7 +26,7 @@ /* SOF ABI version major, minor and patch numbers */ #define SOF_ABI_MAJOR 3 -#define SOF_ABI_MINOR 5 +#define SOF_ABI_MINOR 6 #define SOF_ABI_PATCH 0 /* SOF ABI version number. Format within 32bit word is MMmmmppp */ diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index b04b99cc0ff8c0..a52b288c58f0ed 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -42,6 +42,12 @@ /* size of tplg abi in byte */ #define SOF_TPLG_ABI_SIZE 3 +/* external events */ +enum sof_event_types { + SOF_EVENT_NONE = 0, + SOF_KEYWORD_DETECT_DAPM_EVENT, +}; + /* send pcm params ipc */ static int ipc_pcm_params(struct snd_sof_widget *swidget, int dir) { @@ -382,6 +388,16 @@ static enum sof_ipc_frame find_format(const char *name) return SOF_IPC_FRAME_S32_LE; } +/** \brief Types of processing components */ +enum sof_ipc_process_type { + SOF_PROCESS_NONE = 0, /**< None */ + SOF_PROCESS_EQFIR, /**< Intel FIR */ + SOF_PROCESS_EQIIR, /**< Intel IIR */ + SOF_PROCESS_KEYWORD_DETECT, /**< Keyword Detection */ + SOF_PROCESS_KPB, /**< KeyPhrase Buffer Manager */ + SOF_PROCESS_CHAN_SELECTOR, /**< Channel Selector */ +}; + struct sof_process_types { const char *name; enum sof_ipc_process_type type;