Skip to content

Commit 3a34419

Browse files
committed
WIP: topology: add I2S function topology
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
1 parent 9326351 commit 3a34419

File tree

2 files changed

+39
-0
lines changed

2 files changed

+39
-0
lines changed

tools/topology/topology2/cavs-es83x6.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<pipeline.conf>
3939
<dai.conf>
4040
<host.conf>
41+
<bt-default.conf>
4142
<dmic-default.conf>
4243
<hdmi-default.conf>
4344
<hdmi-in-default.conf>
@@ -61,6 +62,7 @@ Define {
6162
HEADSET_HW_CONFIG_NAME 'HEADSET HWCFG'
6263
HEADSET_PCM_NAME "Headset"
6364
HEADSET_PCM_ID 0
65+
INCLUDE_BT_OFFLOAD false
6466
}
6567

6668
# override defaults with platform-specific config
@@ -75,6 +77,10 @@ IncludeByKey.NUM_HDMIS {
7577
"[3-4]" "platform/intel/hdmi-generic.conf"
7678
}
7779

80+
IncludeByKey.INCLUDE_BT_OFFLOAD {
81+
"true" "platform/intel/bt-generic.conf"
82+
}
83+
7884
IncludeByKey.HEADSET_CODEC {
7985
"true" {
8086
#

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,37 @@ EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default"
157157
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS=nhlt,\
158158
NHLT_BIN=nhlt-sof-ptl-dmic-4ch-id5.bin,DMIC0_ENHANCED_CAPTURE=true,\
159159
EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default"
160+
161+
"cavs-es83x6\;sof-ptl-ssp1-codec-id0\;PLATFORM=ptl,PREPROCESS_PLUGINS=nhlt,\
162+
NHLT_BIN=nhlt-sof-ptl-ssp1-codec-id0.bin,HEADSET_SSP_DAI_INDEX=1,\
163+
HEADSET_CODEC=true,HEADSET_CODEC_NAME=SSP1-Codec,NUM_HDMIS=0,\
164+
HDMI_IN_CAPTURE=false"
165+
166+
"cavs-es83x6\;sof-ptl-ssp1-codec-id1\;PLATFORM=ptl,PREPROCESS_PLUGINS=nhlt,\
167+
NHLT_BIN=nhlt-sof-ptl-ssp1-codec-id1.bin,HEADSET_SSP_DAI_INDEX=1,\
168+
HEADSET_CODEC=true,HEADSET_CODEC_NAME=SSP1-Codec,NUM_HDMIS=0,\
169+
HDMI_IN_CAPTURE=false"
170+
171+
#HDMI IN port: SSP0 and SSP2, SSP number is a masked in HDMI_IN_1_ID and HDMI_IN_2_ID
172+
"cavs-es83x6\;sof-ptl-ssp5-hdmiin-id0\;PLATFORM=ptl,PREPROCESS_PLUGINS=nhlt,NUM_HDMIS=0,\
173+
NHLT_BIN=nhlt-sof-ptl-ssp5-hdmiin-id0.bin,HEADSET_CODEC=false,HDMI_IN_CAPTURE=true,\
174+
HDMI_IN_1_ID=0,HDMI_IN_2_ID=1"
175+
176+
"cavs-es83x6\;sof-ptl-ssp5-hdmiin-id1\;PLATFORM=ptl,PREPROCESS_PLUGINS=nhlt,NUM_HDMIS=0,\
177+
NHLT_BIN=nhlt-sof-ptl-ssp5-hdmiin-id1.bin,HEADSET_CODEC=false,HDMI_IN_CAPTURE=true,\
178+
HDMI_IN_1_ID=1,HDMI_IN_2_ID=2"
179+
180+
"cavs-es83x6\;sof-ptl-ssp2-bt-id2\;PLATFORM=ptl,INCLUDE_BT_OFFLOAD=true,NUM_HDMIS=0,\
181+
HEADSET_CODEC=false,HDMI_IN_CAPTURE=false,BT_ID=2,PREPROCESS_PLUGINS=nhlt,\
182+
NHLT_BIN=nhlt-sof-ptl-ssp2-bt-id2.bin"
183+
184+
#BT_ID=10 for sdw_sof machine
185+
"cavs-sdw\;sof-ptl-ssp2-bt-id8\;PLATFORM=ptl,ADD_BT=true,SDW_JACK=false,NUM_HDMIS=0,\
186+
HEADSET_CODEC=false,HDMI_IN_CAPTURE=false,BT_ID=8,BT_PCM_ID=20,BT_PCM_NAME=Bluetooth,\
187+
BT_CP_HOST_PIPELINE_ID=201,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-ssp2-bt-id8.bin"
188+
189+
#BT_ID=10 for sdw_sof machine
190+
"cavs-sdw\;sof-ptl-ssp2-bt-id10\;PLATFORM=ptl,ADD_BT=true,SDW_JACK=false,NUM_HDMIS=0,\
191+
HEADSET_CODEC=false,HDMI_IN_CAPTURE=false,BT_ID=10,BT_PCM_ID=20,BT_PCM_NAME=Bluetooth,\
192+
BT_CP_HOST_PIPELINE_ID=201,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-ssp2-bt-id10.bin"
160193
)

0 commit comments

Comments
 (0)