Skip to content

Commit c60bff8

Browse files
committed
topology2: sof-mtl-rt5650: add FMT_24 support
RT5650 need to use 24 bit format due to S32_LE not support. Signed-off-by: Mac Chiang <mac.chiang@intel.com>
1 parent 2752cdf commit c60bff8

3 files changed

Lines changed: 24 additions & 3 deletions

File tree

tools/topology/topology2/cavs-mixin-mixout-eqiir-dts-ssp.conf

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,17 @@ Object.Pipeline {
4646
copier_type "SSP"
4747
stream_name "$HEADSET_CODEC_NAME"
4848
node_type $I2S_LINK_OUTPUT_CLASS
49-
}
49+
IncludeByKey.I2S_AMP_FMT_24 {
50+
"true" {
51+
Object.Base.output_audio_format [
52+
{
53+
out_bit_depth 32
54+
out_valid_bit_depth 24
55+
}
56+
]
57+
}
58+
}
59+
}
5060

5161
Object.Widget.gain.1 {
5262
Object.Control.mixer.1 {
@@ -76,7 +86,17 @@ Object.Pipeline {
7686
copier_type "SSP"
7787
stream_name "$SPEAKER_CODEC_NAME"
7888
node_type $I2S_LINK_OUTPUT_CLASS
79-
}
89+
IncludeByKey.I2S_AMP_FMT_24 {
90+
"true" {
91+
Object.Base.output_audio_format [
92+
{
93+
out_bit_depth 32
94+
out_valid_bit_depth 24
95+
}
96+
]
97+
}
98+
}
99+
}
80100

81101
Object.Widget.gain.1 {
82102
Object.Control.mixer.1 {

tools/topology/topology2/cavs-rt5682.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ Define {
118118
DMIC_PIPELINE_PRIORITY 1
119119
ECHO_REF_PIPELINE_PRIORITY 0
120120
PLAYBACK_PIPELINE_SRC "volume"
121+
I2S_AMP_FMT_24 false
121122
}
122123

123124
# override defaults with platform-specific config

tools/topology/topology2/production/tplg-targets-ace1.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\
6969
NHLT_BIN=nhlt-sof-mtl-max98357a-rt5682.bin,DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_INDEX=2,\
7070
SPK_ID=6,SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\
7171
BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=7,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,USE_CHAIN_DMA=true,\
72-
GOOGLE_RTC_AEC_SUPPORT=1,DEEP_BUF_SPK=true,PLAYBACK_PIPELINE_SRC=dts"
72+
GOOGLE_RTC_AEC_SUPPORT=1,DEEP_BUF_SPK=true,PLAYBACK_PIPELINE_SRC=dts,I2S_AMP_FMT_24=true"
7373

7474
#ES83x6+HDMI-IN
7575
"cavs-es83x6\;sof-mtl-es83x6-ssp1-hdmi-ssp02\;PLATFORM=mtl,PREPROCESS_PLUGINS=nhlt,\

0 commit comments

Comments
 (0)