Skip to content

Commit

Permalink
Fred:WIP: DMIC 16Khz 2ch
Browse files Browse the repository at this point in the history 
Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
  • Loading branch information
@fredoh9
fredoh9 committed Feb 23, 2024
1 parent 4314c15 commit f44700f
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 20 deletions.
1 change: 1 addition & 0 deletions tools/topology/topology2/platform/intel/dmic-generic.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Object.Dai.DMIC [
mic_a_enable $PDM1_MIC_A_ENABLE
mic_b_enable $PDM1_MIC_B_ENABLE
}
fifo_word_length 16
}
]

Expand Down
38 changes: 19 additions & 19 deletions tools/topology/topology2/platform/intel/dmic1-passthrough.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ Object.Pipeline.host-gateway-capture [
Object.Base.input_audio_format [
{
in_rate $DMIC1_RATE
in_bit_depth 32
in_valid_bit_depth 32
in_bit_depth 16
in_valid_bit_depth 16
}
{
in_rate $DMIC1_RATE
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
in_bit_depth 16
in_valid_bit_depth 16
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
}
Expand All @@ -28,14 +28,14 @@ Object.Pipeline.host-gateway-capture [
Object.Base.output_audio_format [
{
out_rate $DMIC1_RATE
out_bit_depth 32
out_valid_bit_depth 32
out_bit_depth 16
out_valid_bit_depth 16
}
{
out_rate $DMIC1_RATE
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
out_bit_depth 16
out_valid_bit_depth 16
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
Expand All @@ -58,14 +58,14 @@ Object.Pipeline.io-gateway-capture [
Object.Base.input_audio_format [
{
in_rate $DMIC1_RATE
in_bit_depth 32
in_valid_bit_depth 32
in_bit_depth 16
in_valid_bit_depth 16
}
{
in_rate $DMIC1_RATE
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
in_bit_depth 16
in_valid_bit_depth 16
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
}
Expand All @@ -74,14 +74,14 @@ Object.Pipeline.io-gateway-capture [
Object.Base.output_audio_format [
{
out_rate $DMIC1_RATE
out_bit_depth 32
out_valid_bit_depth 32
out_bit_depth 16
out_valid_bit_depth 16
}
{
out_rate $DMIC1_RATE
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
out_bit_depth 16
out_valid_bit_depth 16
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
Expand Down Expand Up @@ -109,9 +109,9 @@ Object.PCM.pcm [
Object.PCM.pcm_caps.1 {
name $DMIC1_PCM_CAPS
# only 32-bit capture supported now
formats 'S32_LE'
channels_min $NUM_DMICS
channels_max $NUM_DMICS
formats 'S32_LE,S16_LE'
channels_min 2
channels_max 2
rate_min $DMIC1_RATE
rate_max $DMIC1_RATE
}
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology2/production/tplg-targets-hda-generic.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-cavs25-4ch.bin"

# Topologies for ACE1 and ACE2 architectures
"sof-hda-generic\;sof-hda-generic-ace1-2ch\;PLATFORM=mtl,HDA_CONFIG=mix,NUM_DMICS=2,\
"sof-hda-generic\;sof-hda-generic-ace1-2ch\;PLATFORM=mtl,HDA_CONFIG=mix,NUM_DMICS=2,DMIC1_ENABLE=passthrough,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace1-2ch.bin"
"sof-hda-generic\;sof-hda-generic-ace1-4ch\;PLATFORM=mtl,HDA_CONFIG=mix,NUM_DMICS=4,\
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC1_ENABLE=passthrough,\
Expand Down

0 comments on commit f44700f

Please sign in to comment.