Skip to content

Commit 4a1aae6

Browse files
bardliaobardliao
committed
topology2: add topologies for each sdca functions
Add topologies for each sdca function. Linux kernel will load the corresponding topology per sdca function. The naming rule is sof-<platform>-<function>-<BE id> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
1 parent 1e60bed commit 4a1aae6

File tree

3 files changed

+95
-0
lines changed

3 files changed

+95
-0
lines changed

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,53 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
110110
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
111111
SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
112112

113+
#SDCA multi-function
114+
"cavs-sdw\;sof-arl-sdca-jack-id0\;PLATFORM=mtl,SDW_JACK_OUT_STREAM=Playback-SimpleJack,\
115+
SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0"
116+
117+
"cavs-sdw\;sof-arl-sdca-1amp-id2\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\
118+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0"
119+
120+
"cavs-sdw\;sof-arl-sdca-2amp-id2\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\
121+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0"
122+
123+
"cavs-sdw\;sof-arl-sdca-mic-id4\;PLATFORM=mtl,SDW_JACK=false,SDW_DMIC=1,NUM_HDMIS=0,\
124+
SDW_DMIC_STREAM=Capture-SmartMic"
125+
126+
"cavs-sdw\;sof-arl-sdca-hdmi-id5\;PLATFORM=mtl,SDW_JACK=false"
127+
"cavs-sdw\;sof-arl-sdca-hdmi-id7\;PLATFORM=mtl,SDW_JACK=false,HDMI1_ID=7,HDMI2_ID=8,HDMI3_ID=9"
128+
129+
"cavs-sdw\;sof-arl-dmic-2ch-id5\;PLATFORM=mtl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=2,\
130+
PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS=nhlt,\
131+
NHLT_BIN=nhlt-sof-arl-dmic-2ch-id5.bin"
132+
133+
"cavs-sdw\;sof-arl-dmic-4ch-id5\;PLATFORM=mtl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=4,\
134+
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS=nhlt,\
135+
NHLT_BIN=nhlt-sof-arl-dmic-4ch-id5.bin"
136+
137+
"cavs-sdw\;sof-mtl-sdca-jack-id0\;PLATFORM=mtl,SDW_JACK_OUT_STREAM=Playback-SimpleJack,\
138+
SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0"
139+
140+
"cavs-sdw\;sof-mtl-sdca-1amp-id2\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\
141+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0"
142+
143+
"cavs-sdw\;sof-mtl-sdca-2amp-id2\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\
144+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0"
145+
146+
"cavs-sdw\;sof-mtl-sdca-mic-id4\;PLATFORM=mtl,SDW_JACK=false,SDW_DMIC=1,NUM_HDMIS=0,\
147+
SDW_DMIC_STREAM=Capture-SmartMic"
148+
149+
"cavs-sdw\;sof-mtl-sdca-hdmi-id5\;PLATFORM=mtl,SDW_JACK=false"
150+
"cavs-sdw\;sof-mtl-sdca-hdmi-id7\;PLATFORM=mtl,SDW_JACK=false,HDMI1_ID=7,HDMI2_ID=8,HDMI3_ID=9"
151+
152+
"cavs-sdw\;sof-mtl-dmic-2ch-id5\;PLATFORM=mtl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=2,\
153+
PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS=nhlt,\
154+
NHLT_BIN=nhlt-sof-mtl-dmic-2ch-id5.bin"
155+
156+
"cavs-sdw\;sof-mtl-dmic-4ch-id5\;PLATFORM=mtl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=4,\
157+
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS=nhlt,\
158+
NHLT_BIN=nhlt-sof-mtl-dmic-4ch-id5.bin"
159+
113160
# Below topologies are used on Chromebooks
114161

115162
"cavs-rt5682\;sof-mtl-max98357a-rt5682\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\

‎tools/topology/topology2/production/tplg-targets-ace2.cmake‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,30 @@ NUM_DMICS=2,PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,\
3232
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-lnl-rt713-l0-rt1318-l1-2ch.bin,\
3333
HDMI1_ID=6,HDMI2_ID=7,HDMI3_ID=8"
3434

35+
#SDCA multi-function
36+
"cavs-sdw\;sof-lnl-sdca-jack-id0\;PLATFORM=lnl,SDW_JACK_OUT_STREAM=Playback-SimpleJack,\
37+
SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0"
38+
39+
"cavs-sdw\;sof-lnl-sdca-1amp-id2\;PLATFORM=lnl,NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\
40+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0"
41+
42+
"cavs-sdw\;sof-lnl-sdca-2amp-id2\;PLATFORM=lnl,NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\
43+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0"
44+
45+
"cavs-sdw\;sof-lnl-sdca-mic-id4\;PLATFORM=lnl,SDW_JACK=false,SDW_DMIC=1,NUM_HDMIS=0,\
46+
SDW_DMIC_STREAM=Capture-SmartMic"
47+
48+
"cavs-sdw\;sof-lnl-sdca-hdmi-id5\;PLATFORM=lnl,SDW_JACK=false"
49+
"cavs-sdw\;sof-lnl-sdca-hdmi-id7\;PLATFORM=lnl,SDW_JACK=false,HDMI1_ID=7,HDMI2_ID=8,HDMI3_ID=9"
50+
51+
"cavs-sdw\;sof-lnl-dmic-2ch-id5\;PLATFORM=lnl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=2,\
52+
PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS=nhlt,\
53+
NHLT_BIN=nhlt-sof-lnl-dmic-2ch-id5.bin"
54+
55+
"cavs-sdw\;sof-lnl-dmic-4ch-id5\;PLATFORM=lnl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=4,\
56+
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS=nhlt,\
57+
NHLT_BIN=nhlt-sof-lnl-dmic-4ch-id5.bin"
58+
3559
# No SDW Jack. SDW DMIC+SPK
3660
"cavs-sdw\;sof-lnl-rt1318-l12-rt714-l0\;PLATFORM=lnl,SDW_JACK=false,SDW_DMIC=1,\
3761
NUM_SDW_AMP_LINKS=2,SDW_DMIC_STREAM=SDW0-Capture"

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,28 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
3232
"cavs-sdw\;sof-ptl-rt713-l2-rt1320-l13\;PLATFORM=ptl,SDW_DMIC=1,NUM_SDW_AMP_LINKS=2,\
3333
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
3434
SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
35+
36+
#SDCA multi-function
37+
"cavs-sdw\;sof-ptl-sdca-jack-id0\;PLATFORM=mtl,SDW_JACK_OUT_STREAM=Playback-SimpleJack,\
38+
SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0"
39+
40+
"cavs-sdw\;sof-ptl-sdca-1amp-id2\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\
41+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0"
42+
43+
"cavs-sdw\;sof-ptl-sdca-2amp-id2\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\
44+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0"
45+
46+
"cavs-sdw\;sof-ptl-sdca-mic-id4\;PLATFORM=mtl,SDW_JACK=false,SDW_DMIC=1,NUM_HDMIS=0,\
47+
SDW_DMIC_STREAM=Capture-SmartMic"
48+
49+
"cavs-sdw\;sof-ptl-sdca-hdmi-id5\;PLATFORM=mtl,SDW_JACK=false"
50+
"cavs-sdw\;sof-ptl-sdca-hdmi-id7\;PLATFORM=mtl,SDW_JACK=false,HDMI1_ID=7,HDMI2_ID=8,HDMI3_ID=9"
51+
52+
"cavs-sdw\;sof-ptl-dmic-2ch-id5\;PLATFORM=mtl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=2,\
53+
PDM1_MIC_A_ENABLE=0,PDM1_MIC_B_ENABLE=0,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS=nhlt,\
54+
NHLT_BIN=nhlt-sof-ptl-dmic-2ch-id5.bin"
55+
56+
"cavs-sdw\;sof-ptl-dmic-4ch-id5\;PLATFORM=mtl,SDW_JACK=false,NUM_HDMIS=0,NUM_DMICS=4,\
57+
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,DMIC0_ID=5,DMIC1_ID=6,PREPROCESS_PLUGINS=nhlt,\
58+
NHLT_BIN=nhlt-sof-ptl-dmic-4ch-id5.bin"
3559
)

0 commit comments

Comments
 (0)