From 2762ada65ef282ad0173a188c5344ee787189934 Mon Sep 17 00:00:00 2001 From: Keyon Jie Date: Tue, 2 Jul 2019 19:31:08 +0800 Subject: [PATCH] topology: cml-rt5682-kwd: change to use S24_LE format for CML As dmic only support 16 bit or 32 bit, we configure dmic dai to be s32_le, and pipelines to be s24_le. Signed-off-by: Keyon Jie --- tools/topology/sof-cml-rt5682-kwd.m4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/topology/sof-cml-rt5682-kwd.m4 b/tools/topology/sof-cml-rt5682-kwd.m4 index 4a28d3f9e..6c16569a0 100644 --- a/tools/topology/sof-cml-rt5682-kwd.m4 +++ b/tools/topology/sof-cml-rt5682-kwd.m4 @@ -151,16 +151,16 @@ DAI_ADD(sof/pipe-dai-playback.m4, # Passthrough capture pipeline 7 on PCM 7 using max 2 channels. # Schedule 320 frames per 20000us deadline on core 0 with priority 0 PIPELINE_PCM_ADD(sof/pipe-kfbm-capture.m4, - 8, 8, 2, s16le, + 8, 8, 2, s24le, KWD_PERIOD_FRAMES, KWD_PIPE_SCH_DEADLINE_US, 0, 0) # capture DAI is DMIC 1 using 2 periods -# Buffers use s16le format, with 320 frame per 20000us on core 0 with priority 0 +# Buffers use s32le format, with 320 frame per 20000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, 8, DMIC, 1, dmic16k, - PIPELINE_SINK_8, 2, s16le, + PIPELINE_SINK_8, 2, s32le, KWD_PERIOD_FRAMES, KWD_PIPE_SCH_DEADLINE_US, 0, 0) @@ -178,7 +178,7 @@ PCM_PLAYBACK_ADD(HDMI3, 4, PIPELINE_PCM_6) dnl PIPELINE_ADD(pipeline, dnl pipe id, max channels, format, dnl frames, deadline, priority, core) -PIPELINE_ADD(sof/pipe-detect.m4, 9, 2, s16le, +PIPELINE_ADD(sof/pipe-detect.m4, 9, 2, s24le, KWD_PERIOD_FRAMES, KWD_PIPE_SCH_DEADLINE_US, 0, 0, PIPELINE_SCHED_COMP_8) @@ -215,7 +215,7 @@ DAI_CONFIG(DMIC, 0, 1, dmic01, # dmic16k (ID: 2) DAI_CONFIG(DMIC, 1, 2, dmic16k, DMIC_CONFIG(1, 500000, 4800000, 40, 60, 16000, - DMIC_WORD_LENGTH(s16le), 400, DMIC, 1, + DMIC_WORD_LENGTH(s32le), 400, DMIC, 1, PDM_CONFIG(DMIC, 1, STEREO_PDM0))) # 3 HDMI/DP outputs (ID: 3,4,5)