Skip to content

Commit 9972bbf

Browse files
committed
tools: topology2: align DMIC copier formats with NHLT for ADL MWW
Update the NHLT configuration and DMIC DAI copier input formats for the Alder Lake microWakeWord (MWW) PCAN KPB topology. Specifically: - In dai-copier-micsel-eqiir-kpb-be, restrict the DMIC DAI copier input audio formats to 32-bit (16 kHz, 4 channels), removing 16-bit and 24-in-32 formats to match the NHLT configuration. - In tplg-targets.cmake, update NHLT_BIN to nhlt-sof-adl-max98357a-rt5682-mww-pcan-kpb.bin for the sof-adl-max98357a-rt5682-mww-pcan-kpb target. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
1 parent 0e05216 commit 9972bbf

2 files changed

Lines changed: 2 additions & 19 deletions

File tree

‎tools/topology/topology2/development/tplg-targets.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ INCLUDE_BT_OFFLOAD=false,DEEP_BUF_SPK=true,SPEAKER_CODEC_NAME=SSP2-Codec,SPEAKER
413413

414414
"cavs-rt5682\;sof-adl-max98357a-rt5682-mww-pcan-kpb\;PLATFORM=adl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
415415
PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,NUM_HDMIS=4,\
416-
NHLT_BIN=nhlt-sof-adl-max98357a-rt5682.bin,SPK_ID=7,DEEPBUFFER_FW_DMA_MS=10,INCLUDE_ECHO_REF=true,\
416+
NHLT_BIN=nhlt-sof-adl-max98357a-rt5682-mww-pcan-kpb.bin,SPK_ID=7,DEEPBUFFER_FW_DMA_MS=10,INCLUDE_ECHO_REF=true,\
417417
INCLUDE_BT_OFFLOAD=false,DEEP_BUF_SPK=true,SPEAKER_CODEC_NAME=SSP2-Codec,SPEAKER_SSP_DAI_INDEX=2,\
418418
DMIC_MWW_KPB_CAPTURE=true,MWW_PCAN=true"
419419

‎tools/topology/topology2/include/pipelines/cavs/dai-copier-micsel-eqiir-kpb-be.conf‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,28 +54,11 @@ Class.Pipeline."dai-copier-micsel-eqiir-kpb-be" {
5454
copier_type "DMIC"
5555
node_type $DMIC_LINK_INPUT_CLASS
5656
stream_name $DMIC1_NAME
57-
num_input_audio_formats 3
57+
num_input_audio_formats 1
5858
num_output_audio_formats 1
5959
num_output_pins 1
6060

6161
Object.Base.input_audio_format [
62-
{
63-
in_rate 16000
64-
in_channels 4
65-
in_bit_depth 16
66-
in_valid_bit_depth 16
67-
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
68-
in_ch_map $CHANNEL_MAP_3_POINT_1
69-
}
70-
{
71-
in_rate 16000
72-
in_channels 4
73-
in_bit_depth 32
74-
in_valid_bit_depth 24
75-
in_sample_type $SAMPLE_TYPE_MSB_INTEGER
76-
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
77-
in_ch_map $CHANNEL_MAP_3_POINT_1
78-
}
7962
{
8063
in_rate 16000
8164
in_channels 4

0 commit comments

Comments
 (0)