From 87bbc1b196f3bc51b88494d73498918fb3e76825 Mon Sep 17 00:00:00 2001 From: Keyon Jie Date: Wed, 24 Apr 2019 16:09:17 +0800 Subject: [PATCH 1/3] ASoC: SOF: topology: move sof_event_types enum to c file The enumurated type is used inside sof/topology.c only, split it out from topology.h to make the header file totally aligned with FW. Signed-off-by: Keyon Jie --- include/sound/sof/topology.h | 6 ------ sound/soc/sof/topology.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h index 46b2a7e63167bb..9ab62a9b99eccf 100644 --- a/include/sound/sof/topology.h +++ b/include/sound/sof/topology.h @@ -247,10 +247,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/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index b04b99cc0ff8c0..deabe7b02989f2 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) { From 5e7c6de80dca6e1b4dd63c7d7b8a5fa7f8e7dcab Mon Sep 17 00:00:00 2001 From: Keyon Jie Date: Wed, 24 Apr 2019 17:37:20 +0800 Subject: [PATCH 2/3] ASoC: SOF: topology: move sof_ipc_process_type enum to c file The enumurated type is used inside sof/topology.c only, split it out from topology.h to make the header file totally aligned with FW. Signed-off-by: Keyon Jie --- include/sound/sof/topology.h | 10 ---------- sound/soc/sof/topology.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h index 9ab62a9b99eccf..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; diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index deabe7b02989f2..a52b288c58f0ed 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -388,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; From 8a2b6362623647f1bb44ea9d16bf5872c44f3259 Mon Sep 17 00:00:00 2001 From: Keyon Jie Date: Fri, 19 Apr 2019 13:32:32 +0800 Subject: [PATCH 3/3] ASoC: SOF: abi: bump to 3.6.0 Bump ABI version to 3.6.0 to align with FW. Signed-off-by: Keyon Jie --- include/uapi/sound/sof/abi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */