[SKIP CI][Do not review][Test] Tools: Topology2: Make topology for MT…

…L with 96 kHz DMIC Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
thesofproject · Dec 20, 2023 · 2a9fb53 · 2a9fb53
1 parent 7ec22d8
commit 2a9fb53
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/tools/topology/topology2/platform/intel/dmic-default.conf b/tools/topology/topology2/platform/intel/dmic-default.conf
@@ -36,4 +36,6 @@ Define {
  DMIC_CORE_ID 0
  PASSTHROUGH "false"
  DMIC_PIPELINE_PRIORITY 0
+ DMIC0_RATE 48000
+ DMIC1_RATE 16000
 }
diff --git a/tools/topology/topology2/platform/intel/dmic-generic.conf b/tools/topology/topology2/platform/intel/dmic-generic.conf
@@ -9,6 +9,7 @@ Object.Dai.DMIC [
  id $DMIC0_ID
  driver_version $DMIC_DRIVER_VERSION
  io_clk $DMIC_IO_CLK
+ sample_rate $DMIC0_RATE
  clk_min 500000
  clk_max 4800000
  unmute_ramp_time_ms 200
@@ -39,7 +40,7 @@ Object.Dai.DMIC [
  dai_index 1
  driver_version $DMIC_DRIVER_VERSION
  io_clk $DMIC_IO_CLK
- sample_rate 16000
+ sample_rate $DMIC1_RATE
  clk_min 500000
  clk_max 4800000
  unmute_ramp_time_ms 200
@@ -84,10 +85,12 @@ IncludeByKey.PASSTHROUGH {
  num_output_audio_formats 2
  Object.Base.input_audio_format [
  {
+ in_rate $DMIC0_RATE
  in_bit_depth 32
  in_valid_bit_depth 32
  }
  {
+ in_rate $DMIC0_RATE
  in_channels 4
  in_bit_depth 32
  in_valid_bit_depth 32
@@ -97,10 +100,12 @@ IncludeByKey.PASSTHROUGH {
  ]
  Object.Base.output_audio_format [
  {
+ out_rate $DMIC0_RATE
  out_bit_depth 32
  out_valid_bit_depth 32
  }
  {
+ out_rate $DMIC0_RATE
  out_channels 4
  out_bit_depth 32
  out_valid_bit_depth 32
@@ -115,10 +120,12 @@ IncludeByKey.PASSTHROUGH {
  num_output_audio_formats 2
  Object.Base.input_audio_format [
  {
+ in_rate $DMIC0_RATE
  in_bit_depth 32
  in_valid_bit_depth 32
  }
  {
+ in_rate $DMIC0_RATE
  in_channels 4
  in_bit_depth 32
  in_valid_bit_depth 32
@@ -128,10 +135,12 @@ IncludeByKey.PASSTHROUGH {
  ]
  Object.Base.output_audio_format [
  {
+ out_rate $DMIC0_RATE
  out_bit_depth 32
  out_valid_bit_depth 32
  }
  {
+ out_rate $DMIC0_RATE
  out_channels 4
  out_bit_depth 32
  out_valid_bit_depth 32
@@ -149,10 +158,12 @@ IncludeByKey.PASSTHROUGH {
  num_output_audio_formats 2
  Object.Base.input_audio_format [
  {
+ in_rate $DMIC0_RATE
  in_bit_depth 32
  in_valid_bit_depth 32
  }
  {
+ in_rate $DMIC0_RATE
  in_channels 4
  in_bit_depth 32
  in_valid_bit_depth 32
@@ -162,10 +173,12 @@ IncludeByKey.PASSTHROUGH {
  ]
  Object.Base.output_audio_format [
  {
+ out_rate $DMIC0_RATE
  out_bit_depth 32
  out_valid_bit_depth 32
  }
  {
+ out_rate $DMIC0_RATE
  out_channels 4
  out_bit_depth 32
  out_valid_bit_depth 32
@@ -234,10 +247,12 @@ IncludeByKey.PASSTHROUGH {
  num_input_audio_formats 2
  Object.Base.input_audio_format [
  {
+ in_rate $DMIC0_RATE
  in_bit_depth 32
  in_valid_bit_depth 32
  }
  {
+ in_rate $DMIC0_RATE
  in_channels 4
  in_bit_depth 32
  in_valid_bit_depth 32
@@ -248,10 +263,12 @@ IncludeByKey.PASSTHROUGH {
  num_output_audio_formats 2
  Object.Base.output_audio_format [
  {
+ out_rate $DMIC0_RATE
  out_bit_depth 32
  out_valid_bit_depth 32
  }
  {
+ out_rate $DMIC0_RATE
  out_channels 4
  out_bit_depth 32
  out_valid_bit_depth 32
@@ -275,10 +292,12 @@ IncludeByKey.PASSTHROUGH {
  num_input_audio_formats 2
  Object.Base.input_audio_format [
  {
+ in_rate $DMIC0_RATE
  in_bit_depth 32
  in_valid_bit_depth 32
  }
  {
+ in_rate $DMIC0_RATE
  in_channels 4
  in_bit_depth 32
  in_valid_bit_depth 32
@@ -289,10 +308,12 @@ IncludeByKey.PASSTHROUGH {
  num_output_audio_formats 2
  Object.Base.output_audio_format [
  {
+ out_rate $DMIC0_RATE
  out_bit_depth 32
  out_valid_bit_depth 32
  }
  {
+ out_rate $DMIC0_RATE
  out_channels 4
  out_bit_depth 32
  out_valid_bit_depth 32
@@ -327,6 +348,8 @@ Object.PCM.pcm [
  formats 'S32_LE'
  channels_min $NUM_DMICS
  channels_max $NUM_DMICS
+ rate_min $DMIC0_RATE
+ rate_max $DMIC0_RATE
  }
  }
 ]
diff --git a/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake b/tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake
@@ -97,6 +97,13 @@ BT_NAME=SSP1-BT,BT_INDEX=1,BT_PCM_ID=20,BT_ID=8,BT_PCM_NAME=Bluetooth,ADD_BT=tru
 NUM_SDW_AMP_LINKS=1,SDW_SPK_STREAM=SDW2-Playback,SDW_AMP_FEEDBACK=false,\
 SDW_JACK_CAPTURE_CH=1,DEEPBUFFER_FW_DMA_MS=100,DEEPBUFFER_D0I3_COMPATIBLE=true"
 
+"cavs-sdw\;sof-mtl-sdw-cs42l42-l0-max98363-l2-dmic96\;PLATFORM=mtl,\
+NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=3,DMIC1_ID=4,DMIC0_RATE=96000,DMIC1_RATE=48000,\
+PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-sdw-cs42l42-l0-max98363-l2-dmic96.bin,\
+BT_NAME=SSP1-BT,BT_INDEX=1,BT_PCM_ID=20,BT_ID=8,BT_PCM_NAME=Bluetooth,ADD_BT=true,\
+NUM_SDW_AMP_LINKS=1,SDW_SPK_STREAM=SDW2-Playback,SDW_AMP_FEEDBACK=false,\
+SDW_JACK_CAPTURE_CH=1,DEEPBUFFER_FW_DMA_MS=100,DEEPBUFFER_D0I3_COMPATIBLE=true"
+
 # SDW topology for LNL RVP
 "cavs-sdw\;sof-lnl-rt711-4ch\;PLATFORM=lnl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
 DMIC0_ID=2,DMIC1_ID=3,NUM_HDMIS=0,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-rt711-4ch.bin,\