From 2f10fc75c22f47bdf8de4b966109ba919e3709f9 Mon Sep 17 00:00:00 2001 From: Chao Song Date: Tue, 28 Feb 2023 15:23:10 +0800 Subject: [PATCH 1/2] topology2: fix wov issue introduced by using array Some minor issues introduced by using topology2 array, fix them in this patch. Signed-off-by: Chao Song --- tools/topology/topology2/platform/intel/dmic-wov.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/topology/topology2/platform/intel/dmic-wov.conf b/tools/topology/topology2/platform/intel/dmic-wov.conf index fc01e2fc5ca9..9c3b4b603869 100644 --- a/tools/topology/topology2/platform/intel/dmic-wov.conf +++ b/tools/topology/topology2/platform/intel/dmic-wov.conf @@ -35,8 +35,10 @@ Object.Pipeline { } } } + ] - dai-kpb-be.12 { + dai-kpb-be [ + { direction "capture" format $FORMAT rate 16000 @@ -108,7 +110,7 @@ Object.Pipeline { ] } -Object.Base.route [ { +Object.Base.route [ { source $DMIC_WOV_DAI_PIPELINE_KPB sink $DMIC1_HOST_PIPELINE_SINK From a38ec23f6696773d9445c848a7b4e3a3e7062339 Mon Sep 17 00:00:00 2001 From: Chao Song Date: Tue, 28 Feb 2023 15:25:35 +0800 Subject: [PATCH 2/2] topology2: wov-detect: correct use of define variables To refer to a define variable, we should use "$DEFINE_VAR_NAME". The $ symbol is required. Signed-off-by: Chao Song --- .../topology2/include/pipelines/cavs/wov-detect.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf b/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf index e35b0b4bde24..94084397a320 100644 --- a/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf +++ b/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf @@ -67,9 +67,9 @@ Class.Pipeline."wov-detect" { out_rate 16000 in_channels 2 out_channels 1 - in_ch_map CHANNEL_MAP_STEREO + in_ch_map $CHANNEL_MAP_STEREO in_ch_cfg 1 - out_ch_map CHANNEL_MAP_MONO + out_ch_map $CHANNEL_MAP_MONO out_ch_cfg 0 out_bit_depth 32 in_bit_depth 32 @@ -87,7 +87,7 @@ Class.Pipeline."wov-detect" { in_channels 1 out_channels 1 in_ch_cfg 0 - in_ch_map CHANNEL_MAP_MONO + in_ch_map $CHANNEL_MAP_MONO out_bit_depth 32 in_bit_depth 32 in_valid_bit_depth 32