diff --git a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf index 02d187bfd9a7..0752ff17f0a6 100644 --- a/tools/topology/topology2/platform/intel/sdw-amp-generic.conf +++ b/tools/topology/topology2/platform/intel/sdw-amp-generic.conf @@ -845,6 +845,42 @@ IncludeByKey.SDW_AMP_FEEDBACK { pcm_id 3 IncludeByKey.AMP_FEEDBACK_CH { + "1" { + num_input_audio_formats 1 + num_output_audio_formats 3 + Object.Base.input_audio_format [ + { + in_channels 1 + in_bit_depth 32 + in_valid_bit_depth 32 + in_ch_cfg $CHANNEL_CONFIG_MONO + in_ch_map $CHANNEL_MAP_MONO + } + ] + Object.Base.output_audio_format [ + { + out_channels 1 + out_bit_depth 32 + out_valid_bit_depth 24 + out_ch_cfg $CHANNEL_CONFIG_MONO + out_ch_map $CHANNEL_MAP_MONO + } + { + out_channels 1 + out_bit_depth 32 + out_valid_bit_depth 32 + out_ch_cfg $CHANNEL_CONFIG_MONO + out_ch_map $CHANNEL_MAP_MONO + } + { + out_channels 1 + out_bit_depth 16 + out_valid_bit_depth 16 + out_ch_cfg $CHANNEL_CONFIG_MONO + out_ch_map $CHANNEL_MAP_MONO + } + ] + } "6" { num_input_audio_formats 1 num_output_audio_formats 3 @@ -942,6 +978,10 @@ IncludeByKey.SDW_AMP_FEEDBACK { in_valid_bit_depth $SDW_LINK_VALID_BITS IncludeByKey.AMP_FEEDBACK_CH { + "1" { + in_ch_cfg $CHANNEL_CONFIG_MONO + in_ch_map $CHANNEL_MAP_MONO + } "2" { in_ch_cfg $CHANNEL_CONFIG_STEREO in_ch_map $CHANNEL_MAP_STEREO @@ -971,6 +1011,10 @@ IncludeByKey.SDW_AMP_FEEDBACK { out_valid_bit_depth 32 IncludeByKey.AMP_FEEDBACK_CH { + "1" { + out_ch_cfg $CHANNEL_CONFIG_MONO + out_ch_map $CHANNEL_MAP_MONO + } "2" { out_ch_cfg $CHANNEL_CONFIG_STEREO out_ch_map $CHANNEL_MAP_STEREO diff --git a/tools/topology/topology2/production/tplg-targets-ace3.cmake b/tools/topology/topology2/production/tplg-targets-ace3.cmake index 58c8b7cdc2e7..d7b8454858d8 100644 --- a/tools/topology/topology2/production/tplg-targets-ace3.cmake +++ b/tools/topology/topology2/production/tplg-targets-ace3.cmake @@ -183,6 +183,25 @@ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=SDW1-Playback,\ SDW_JACK_OUT_STREAM=SDW3-Playback,SDW_JACK_IN_STREAM=SDW3-Capture,\ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-rt713-l3-rt1320-l1-2ch.bin" +"cavs-sdw\;sof-ptl-cs35l56-fb1\;PLATFORM=ptl,NUM_SDW_AMP_LINKS=1,SDW_DMIC=0,SDW_JACK=false,\ +SDW_AMP_FEEDBACK=true,SDW_SPK_STREAM=Playback-SmartAmp,SDW_SPK_IN_STREAM=Capture-SmartAmp,\ +AMP_FEEDBACK_CH=1,AMP_FEEDBACK_CH_PER_LINK=1,\ +HDMI1_ID=4,HDMI2_ID=5,HDMI3_ID=6" + +"cavs-sdw\;sof-ptl-cs35l56-fb1-2ch\;PLATFORM=ptl,NUM_SDW_AMP_LINKS=1,SDW_DMIC=0,SDW_JACK=false,\ +NUM_DMICS=2,PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,DMIC0_ID=4,DMIC1_ID=5,\ +SDW_AMP_FEEDBACK=true,SDW_SPK_STREAM=Playback-SmartAmp,SDW_SPK_IN_STREAM=Capture-SmartAmp,\ +AMP_FEEDBACK_CH=1,AMP_FEEDBACK_CH_PER_LINK=1,\ +HDMI1_ID=6,HDMI2_ID=7,HDMI3_ID=8,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-cs35l56-fb1-2ch.bin" + +"cavs-sdw\;sof-ptl-cs35l56-fb1-4ch\;PLATFORM=ptl,NUM_SDW_AMP_LINKS=1,SDW_DMIC=0,SDW_JACK=false,\ +NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=4,DMIC1_ID=5,\ +SDW_AMP_FEEDBACK=true,SDW_SPK_STREAM=Playback-SmartAmp,SDW_SPK_IN_STREAM=Capture-SmartAmp,\ +AMP_FEEDBACK_CH=1,AMP_FEEDBACK_CH_PER_LINK=1,\ +HDMI1_ID=6,HDMI2_ID=7,HDMI3_ID=8,\ +PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-cs35l56-fb1-4ch.bin" + "cavs-sdw\;sof-ptl-cs42l43-l2-cs35l56x6-l13\;NUM_SDW_AMP_LINKS=3,SDW_DMIC=1,\ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"