Skip to content

Commit 190cfd7

Browse files
plbossartlgirdwood
plbossart
authored and
lgirdwood
committed
topology1: add SSP1 for all ES8336, SSP5 for APL/GLK
We apparently missed quite a few platforms with SSP1, and SSP5 is also needed for APL/GLK. One day we'll have a better way to add topologies, but so far it's brute-force combinatorial addition. Oh well. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
1 parent 9d37a33 commit 190cfd7

1 file changed

Lines changed: 40 additions & 15 deletions

File tree

‎tools/topology/topology1/CMakeLists.txt‎

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -190,38 +190,63 @@ set(TPLGS
190190
"sof-jsl-rt5682\;sof-jsl-cs42l42-mx98360a\;-DPLATFORM=jsl-dedede"
191191

192192
"sof-glk-es8336\;sof-apl-es8336\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=0"
193-
"sof-glk-es8336\;sof-apl-es8336-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=0"
194193
"sof-glk-es8336\;sof-apl-es8336-ssp0\;-DPLATFORM=bxt\;-DSSP_NUM=0\;-DCHANNELS=0"
195-
"sof-glk-es8336\;sof-apl-es8336-dmic2ch-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=2"
194+
"sof-glk-es8336\;sof-apl-es8336-ssp1\;-DPLATFORM=bxt\;-DSSP_NUM=1\;-DCHANNELS=0"
195+
"sof-glk-es8336\;sof-apl-es8336-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=0"
196+
"sof-glk-es8336\;sof-apl-es8336-ssp5\;-DPLATFORM=bxt\;-DSSP_NUM=5\;-DCHANNELS=0"
196197
"sof-glk-es8336\;sof-apl-es8336-dmic2ch-ssp0\;-DPLATFORM=bxt\;-DSSP_NUM=0\;-DCHANNELS=2"
197-
"sof-glk-es8336\;sof-apl-es8336-dmic4ch-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=4"
198+
"sof-glk-es8336\;sof-apl-es8336-dmic2ch-ssp1\;-DPLATFORM=bxt\;-DSSP_NUM=1\;-DCHANNELS=2"
199+
"sof-glk-es8336\;sof-apl-es8336-dmic2ch-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=2"
200+
"sof-glk-es8336\;sof-apl-es8336-dmic2ch-ssp5\;-DPLATFORM=bxt\;-DSSP_NUM=5\;-DCHANNELS=2"
198201
"sof-glk-es8336\;sof-apl-es8336-dmic4ch-ssp0\;-DPLATFORM=bxt\;-DSSP_NUM=0\;-DCHANNELS=4"
202+
"sof-glk-es8336\;sof-apl-es8336-dmic4ch-ssp1\;-DPLATFORM=bxt\;-DSSP_NUM=1\;-DCHANNELS=4"
203+
"sof-glk-es8336\;sof-apl-es8336-dmic4ch-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=4"
204+
"sof-glk-es8336\;sof-apl-es8336-dmic4ch-ssp5\;-DPLATFORM=bxt\;-DSSP_NUM=5\;-DCHANNELS=4"
205+
199206
"sof-glk-es8336\;sof-glk-es8336\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=0"
200-
"sof-glk-es8336\;sof-glk-es8336-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=0"
201207
"sof-glk-es8336\;sof-glk-es8336-ssp0\;-DPLATFORM=bxt\;-DSSP_NUM=0\;-DCHANNELS=0"
202-
"sof-glk-es8336\;sof-glk-es8336-dmic2ch-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=2"
208+
"sof-glk-es8336\;sof-glk-es8336-ssp1\;-DPLATFORM=bxt\;-DSSP_NUM=1\;-DCHANNELS=0"
209+
"sof-glk-es8336\;sof-glk-es8336-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=0"
210+
"sof-glk-es8336\;sof-glk-es8336-ssp5\;-DPLATFORM=bxt\;-DSSP_NUM=5\;-DCHANNELS=0"
203211
"sof-glk-es8336\;sof-glk-es8336-dmic2ch-ssp0\;-DPLATFORM=bxt\;-DSSP_NUM=0\;-DCHANNELS=2"
204-
"sof-glk-es8336\;sof-glk-es8336-dmic4ch-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=4"
212+
"sof-glk-es8336\;sof-glk-es8336-dmic2ch-ssp1\;-DPLATFORM=bxt\;-DSSP_NUM=1\;-DCHANNELS=2"
213+
"sof-glk-es8336\;sof-glk-es8336-dmic2ch-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=2"
214+
"sof-glk-es8336\;sof-glk-es8336-dmic2ch-ssp5\;-DPLATFORM=bxt\;-DSSP_NUM=5\;-DCHANNELS=2"
205215
"sof-glk-es8336\;sof-glk-es8336-dmic4ch-ssp0\;-DPLATFORM=bxt\;-DSSP_NUM=0\;-DCHANNELS=4"
206-
"sof-glk-es8336\;sof-jsl-es8336-ssp2\;-DPLATFORM=jsl\;-DSSP_NUM=2\;-DCHANNELS=0"
216+
"sof-glk-es8336\;sof-glk-es8336-dmic4ch-ssp1\;-DPLATFORM=bxt\;-DSSP_NUM=1\;-DCHANNELS=4"
217+
"sof-glk-es8336\;sof-glk-es8336-dmic4ch-ssp2\;-DPLATFORM=bxt\;-DSSP_NUM=2\;-DCHANNELS=4"
218+
"sof-glk-es8336\;sof-glk-es8336-dmic4ch-ssp5\;-DPLATFORM=bxt\;-DSSP_NUM=5\;-DCHANNELS=4"
219+
207220
"sof-glk-es8336\;sof-jsl-es8336-ssp0\;-DPLATFORM=jsl\;-DSSP_NUM=0\;-DCHANNELS=0"
208-
"sof-glk-es8336\;sof-jsl-es8336-dmic2ch-ssp2\;-DPLATFORM=jsl\;-DSSP_NUM=2\;-DCHANNELS=2"
221+
"sof-glk-es8336\;sof-jsl-es8336-ssp1\;-DPLATFORM=jsl\;-DSSP_NUM=1\;-DCHANNELS=0"
222+
"sof-glk-es8336\;sof-jsl-es8336-ssp2\;-DPLATFORM=jsl\;-DSSP_NUM=2\;-DCHANNELS=0"
209223
"sof-glk-es8336\;sof-jsl-es8336-dmic2ch-ssp0\;-DPLATFORM=jsl\;-DSSP_NUM=0\;-DCHANNELS=2"
210-
"sof-glk-es8336\;sof-jsl-es8336-dmic4ch-ssp2\;-DPLATFORM=jsl\;-DSSP_NUM=2\;-DCHANNELS=4"
224+
"sof-glk-es8336\;sof-jsl-es8336-dmic2ch-ssp1\;-DPLATFORM=jsl\;-DSSP_NUM=1\;-DCHANNELS=2"
225+
"sof-glk-es8336\;sof-jsl-es8336-dmic2ch-ssp2\;-DPLATFORM=jsl\;-DSSP_NUM=2\;-DCHANNELS=2"
211226
"sof-glk-es8336\;sof-jsl-es8336-dmic4ch-ssp0\;-DPLATFORM=jsl\;-DSSP_NUM=0\;-DCHANNELS=4"
212-
"sof-glk-es8336\;sof-cml-es8336-ssp2\;-DPLATFORM=cml\;-DSSP_NUM=2\;-DCHANNELS=0"
227+
"sof-glk-es8336\;sof-jsl-es8336-dmic4ch-ssp1\;-DPLATFORM=jsl\;-DSSP_NUM=1\;-DCHANNELS=4"
228+
"sof-glk-es8336\;sof-jsl-es8336-dmic4ch-ssp2\;-DPLATFORM=jsl\;-DSSP_NUM=2\;-DCHANNELS=4"
229+
213230
"sof-glk-es8336\;sof-cml-es8336-ssp0\;-DPLATFORM=cml\;-DSSP_NUM=0\;-DCHANNELS=0"
214-
"sof-glk-es8336\;sof-cml-es8336-dmic2ch-ssp2\;-DPLATFORM=cml\;-DSSP_NUM=2\;-DCHANNELS=2"
231+
"sof-glk-es8336\;sof-cml-es8336-ssp1\;-DPLATFORM=cml\;-DSSP_NUM=1\;-DCHANNELS=0"
232+
"sof-glk-es8336\;sof-cml-es8336-ssp2\;-DPLATFORM=cml\;-DSSP_NUM=2\;-DCHANNELS=0"
215233
"sof-glk-es8336\;sof-cml-es8336-dmic2ch-ssp0\;-DPLATFORM=cml\;-DSSP_NUM=0\;-DCHANNELS=2"
216-
"sof-glk-es8336\;sof-cml-es8336-dmic4ch-ssp2\;-DPLATFORM=cml\;-DSSP_NUM=2\;-DCHANNELS=4"
234+
"sof-glk-es8336\;sof-cml-es8336-dmic2ch-ssp1\;-DPLATFORM=cml\;-DSSP_NUM=1\;-DCHANNELS=2"
235+
"sof-glk-es8336\;sof-cml-es8336-dmic2ch-ssp2\;-DPLATFORM=cml\;-DSSP_NUM=2\;-DCHANNELS=2"
217236
"sof-glk-es8336\;sof-cml-es8336-dmic4ch-ssp0\;-DPLATFORM=cml\;-DSSP_NUM=0\;-DCHANNELS=4"
237+
"sof-glk-es8336\;sof-cml-es8336-dmic4ch-ssp1\;-DPLATFORM=cml\;-DSSP_NUM=1\;-DCHANNELS=4"
238+
"sof-glk-es8336\;sof-cml-es8336-dmic4ch-ssp2\;-DPLATFORM=cml\;-DSSP_NUM=2\;-DCHANNELS=4"
239+
218240
"sof-glk-es8336\;sof-tgl-es8336\;-DPLATFORM=tgl\;-DSSP_NUM=0\;-DCHANNELS=2"
219-
"sof-glk-es8336\;sof-tgl-es8336-ssp2\;-DPLATFORM=tgl\;-DSSP_NUM=2\;-DCHANNELS=0"
220241
"sof-glk-es8336\;sof-tgl-es8336-ssp0\;-DPLATFORM=tgl\;-DSSP_NUM=0\;-DCHANNELS=0"
221-
"sof-glk-es8336\;sof-tgl-es8336-dmic2ch-ssp2\;-DPLATFORM=tgl\;-DSSP_NUM=2\;-DCHANNELS=2"
242+
"sof-glk-es8336\;sof-tgl-es8336-ssp1\;-DPLATFORM=tgl\;-DSSP_NUM=1\;-DCHANNELS=0"
243+
"sof-glk-es8336\;sof-tgl-es8336-ssp2\;-DPLATFORM=tgl\;-DSSP_NUM=2\;-DCHANNELS=0"
222244
"sof-glk-es8336\;sof-tgl-es8336-dmic2ch-ssp0\;-DPLATFORM=tgl\;-DSSP_NUM=0\;-DCHANNELS=2"
223-
"sof-glk-es8336\;sof-tgl-es8336-dmic4ch-ssp2\;-DPLATFORM=tgl\;-DSSP_NUM=2\;-DCHANNELS=4"
245+
"sof-glk-es8336\;sof-tgl-es8336-dmic2ch-ssp1\;-DPLATFORM=tgl\;-DSSP_NUM=1\;-DCHANNELS=2"
246+
"sof-glk-es8336\;sof-tgl-es8336-dmic2ch-ssp2\;-DPLATFORM=tgl\;-DSSP_NUM=2\;-DCHANNELS=2"
224247
"sof-glk-es8336\;sof-tgl-es8336-dmic4ch-ssp0\;-DPLATFORM=tgl\;-DSSP_NUM=0\;-DCHANNELS=4"
248+
"sof-glk-es8336\;sof-tgl-es8336-dmic4ch-ssp1\;-DPLATFORM=tgl\;-DSSP_NUM=1\;-DCHANNELS=4"
249+
"sof-glk-es8336\;sof-tgl-es8336-dmic4ch-ssp2\;-DPLATFORM=tgl\;-DSSP_NUM=2\;-DCHANNELS=4"
225250

226251
"sof-imx8-nocodec\;sof-imx8-nocodec"
227252
"sof-imx8-cs42888\;sof-imx8-cs42888"

0 commit comments

Comments
 (0)