topology2: sof-mtl-rt5650: add SSP FMT 24 bits support

Use 24 bits format on playback and capture pipelines if codec needs, e.g. RT5650 HS/SPK codec. Signed-off-by: Mac Chiang <mac.chiang@intel.com>
thesofproject · Mar 21, 2024 · 7c1d274 · 7c1d274
1 parent 3f6cb04
commit 7c1d274
Show file tree

Hide file tree

Showing 5 changed files with 143 additions and 17 deletions.
diff --git a/tools/topology/topology2/cavs-mixin-mixout-eqiir-dts-ssp.conf b/tools/topology/topology2/cavs-mixin-mixout-eqiir-dts-ssp.conf
@@ -46,6 +46,26 @@ Object.Pipeline {
  copier_type "SSP"
  stream_name "$HEADSET_CODEC_NAME"
  node_type $I2S_LINK_OUTPUT_CLASS
+ IncludeByKey.SSP_HS_FMT_24 {
+ "true" {
+ Object.Base.output_audio_format [
+ {
+ out_bit_depth 32
+ out_valid_bit_depth 24
+ out_sample_type $SAMPLE_TYPE_LSB_INTEGER
+ out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]"
+ }
+ ]
+ }
+ "false" {
+ Object.Base.output_audio_format [
+ {
+ out_bit_depth 32
+ out_valid_bit_depth 32
+ }
+ ]
+ }
+ }
  }
 
  Object.Widget.gain.1 {
@@ -76,6 +96,26 @@ Object.Pipeline {
  copier_type "SSP"
  stream_name "$SPEAKER_CODEC_NAME"
  node_type $I2S_LINK_OUTPUT_CLASS
+ IncludeByKey.SSP_SPK_FMT_24 {
+ "true" {
+ Object.Base.output_audio_format [
+ {
+ out_bit_depth 32
+ out_valid_bit_depth 24
+ out_sample_type $SAMPLE_TYPE_LSB_INTEGER
+ out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]"
+ }
+ ]
+ }
+ "false" {
+ Object.Base.output_audio_format [
+ {
+ out_bit_depth 32
+ out_valid_bit_depth 32
+ }
+ ]
+ }
+ }
  }
 
  Object.Widget.gain.1 {

diff --git a/tools/topology/topology2/cavs-mixin-mixout-ssp.conf b/tools/topology/topology2/cavs-mixin-mixout-ssp.conf
@@ -47,6 +47,26 @@ Object.Pipeline {
  copier_type "SSP"
  stream_name "$HEADSET_CODEC_NAME"
  node_type $I2S_LINK_OUTPUT_CLASS
+ IncludeByKey.SSP_HS_FMT_24 {
+ "true" {
+ Object.Base.output_audio_format [
+ {
+ out_bit_depth 32
+ out_valid_bit_depth 24
+ out_sample_type $SAMPLE_TYPE_LSB_INTEGER
+ out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]"
+ }
+ ]
+ }
+ "false" {
+ Object.Base.output_audio_format [
+ {
+ out_bit_depth 32
+ out_valid_bit_depth 32
+ }
+ ]
+ }
+ }
  }
 
  Object.Widget.gain.1 {
@@ -64,6 +84,26 @@ Object.Pipeline {
  copier_type "SSP"
  stream_name "$SPEAKER_CODEC_NAME"
  node_type $I2S_LINK_OUTPUT_CLASS
+ IncludeByKey.SSP_SPK_FMT_24 {
+ "true" {
+ Object.Base.output_audio_format [
+ {
+ out_bit_depth 32
+ out_valid_bit_depth 24
+ out_sample_type $SAMPLE_TYPE_LSB_INTEGER
+ out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]"
+ }
+ ]
+ }
+ "false" {
+ Object.Base.output_audio_format [
+ {
+ out_bit_depth 32
+ out_valid_bit_depth 32
+ }
+ ]
+ }
+ }
  }
 
  Object.Widget.gain.1 {

diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
@@ -119,6 +119,8 @@ Define {
  DMIC_PIPELINE_PRIORITY 1
  ECHO_REF_PIPELINE_PRIORITY 0
  PLAYBACK_PIPELINE_SRC "volume"
+ SSP_SPK_FMT_24 false
+ SSP_HS_FMT_24 false
 }
 
 # override defaults with platform-specific config
@@ -246,18 +248,40 @@ Object.Pipeline {
  copier_type "SSP"
  stream_name "$HEADSET_CODEC_NAME"
  node_type $I2S_LINK_INPUT_CLASS
- Object.Base.input_audio_format [
- {
- in_bit_depth 32
- in_valid_bit_depth 32
+
+ IncludeByKey.SSP_HS_FMT_24 {
+ "true" {
+ Object.Base.input_audio_format [
+ {
+ in_bit_depth 32
+ in_valid_bit_depth 24
+ in_sample_type $SAMPLE_TYPE_LSB_INTEGER
+ in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]"
+ }
+ ]
+ Object.Base.output_audio_format [
+ {
+ out_bit_depth 32
+ out_valid_bit_depth 32
+ }
+ ]
  }
- ]
- Object.Base.output_audio_format [
- {
- out_bit_depth 32
- out_valid_bit_depth 32
+ "false" {
+ Object.Base.input_audio_format [
+ {
+ in_bit_depth 32
+ in_valid_bit_depth 32
+ }
+
+ ]
+ Object.Base.output_audio_format [
+ {
+ out_bit_depth 32
+ out_valid_bit_depth 32
+ }
+ ]
  }
- ]
+ }
  }
  }
  ]

diff --git a/tools/topology/topology2/platform/intel/speaker-echo-ref.conf b/tools/topology/topology2/platform/intel/speaker-echo-ref.conf
@@ -14,12 +14,26 @@ Object.Pipeline {
  stream_name $SPEAKER_CODEC_NAME
  node_type $I2S_LINK_INPUT_CLASS
  num_input_audio_formats 1
- Object.Base.input_audio_format [
- {
- in_bit_depth 32
- in_valid_bit_depth 32
+ IncludeByKey.SSP_SPK_FMT_24 {
+ "true" {
+ Object.Base.input_audio_format [
+ {
+ in_bit_depth 32
+ in_valid_bit_depth 24
+ in_sample_type $SAMPLE_TYPE_LSB_INTEGER
+ in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]"
+ }
+ ]
  }
- ]
+ "false" {
+ Object.Base.input_audio_format [
+ {
+ in_bit_depth 32
+ in_valid_bit_depth 32
+ }
+ ]
+ }
+ }
  num_output_audio_formats 1
  Object.Base.output_audio_format [
  {

diff --git a/tools/topology/topology2/production/tplg-targets-ace1.cmake b/tools/topology/topology2/production/tplg-targets-ace1.cmake
@@ -82,19 +82,27 @@ NHLT_BIN=nhlt-sof-mtl-rt1019-rt5682.bin,DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_
 SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\
 INCLUDE_ECHO_REF=true,INCLUDE_BT_OFFLOAD=false"
 
+"cavs-rt5682\;sof-mtl-rt5650\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
+PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\
+NHLT_BIN=nhlt-sof-mtl-rt5650.bin,DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_INDEX=2,\
+SPK_ID=6,SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\
+BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=7,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,\
+DEEP_BUF_SPK=true,SSP_SPK_FMT_24=true,SSP_HS_FMT_24=true"
+
 "cavs-rt5682\;sof-mtl-rt5650-dts\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
 PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\
 NHLT_BIN=nhlt-sof-mtl-rt5650-dts.bin,DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_INDEX=2,\
 SPK_ID=6,SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\
 BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=7,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,\
-DEEP_BUF_SPK=true,PLAYBACK_PIPELINE_SRC=dts"
+DEEP_BUF_SPK=true,PLAYBACK_PIPELINE_SRC=dts,SSP_SPK_FMT_24=true,SSP_HS_FMT_24=true"
 
 "cavs-rt5682\;sof-mtl-rt5650-dts-google-aec\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
 PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\
 NHLT_BIN=nhlt-sof-mtl-rt5650-dts-google-aec.bin,DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_INDEX=2,\
 SPK_ID=6,SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\
 BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=7,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,\
-GOOGLE_RTC_AEC_SUPPORT=1,DEEP_BUF_SPK=true,PLAYBACK_PIPELINE_SRC=dts"
+GOOGLE_RTC_AEC_SUPPORT=1,DEEP_BUF_SPK=true,PLAYBACK_PIPELINE_SRC=dts,\
+SSP_SPK_FMT_24=true,SSP_HS_FMT_24=true"
 
 #ES83x6+HDMI-IN
 "cavs-es83x6\;sof-mtl-es83x6-ssp1-hdmi-ssp02\;PLATFORM=mtl,PREPROCESS_PLUGINS=nhlt,\