Skip to content

Commit 3867289

Browse files
committed
topology1: add sdw multi-function codec support
The topology includes multi-function codec support on single SoundWire link. The hardware configuration on RPL product is below: Soundwire# link 0: cs42l43 multi-function codec with JACK, DMIC and Speakers endpoints. The SDW used bidirectional DAI for each sdw link. DAI index starts from 2. sdw0/1/2/3: 2(ALH_OUT/IN) / 3(ALH_IN/OUT) In this SKU, reorder to match cs42l43 DAIs index on sdw link 0: sdw0: 2(JACK_OUT), 3(DMIC_IN), 4(JACK_IN), 5(AMP_OUT) Besides, align the partial string match of dai name from main branch. Signed-off-by: Mac Chiang <mac.chiang@intel.com>
1 parent 181bfe1 commit 3867289

2 files changed

Lines changed: 52 additions & 20 deletions

File tree

tools/topology/topology1/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ set(TPLGS
127127
"sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l0-rt1316-l13-rt714-l2\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DAMP_1_LINK=1\;-DAMP_2_LINK=3\;-DEXT_AMP_REF\;-DMIC_LINK=2"
128128
"sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l2-rt1316-l01-rt714-l3\;-DPLATFORM=adl\;-DUAJ_LINK=2\;-DAMP_1_LINK=0\;-DAMP_2_LINK=1\;-DEXT_AMP_REF\;-DMIC_LINK=3"
129129
"sof-icl-rt711-rt1308-rt715-hdmi\;sof-adl-rt711-l2-rt1316-l01\;-DPLATFORM=adl\;-DUAJ_LINK=2\;-DAMP_1_LINK=0\;-DAMP_2_LINK=1\;-DEXT_AMP_REF\;-DNO_LOCAL_MIC"
130+
"sof-icl-rt711-rt1308-rt715-hdmi\;sof-rpl-cs42l43-l0\;-DPLATFORM=adl\;-DUAJ_LINK=0\;-DMIC_LINK=0\;-DAMP_1_LINK=0\;-DMONO\;-DMFC"
130131
"sof-tgl-rt711-rt1308\;sof-tgl-rt711-rt1308-2ch\;-DCHANNELS=2\;-DEXT_AMP\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DPLATFORM=tgl"
131132
"sof-tgl-rt711-rt1308\;sof-tgl-rt711-rt1308-4ch\;-DCHANNELS=4\;-DEXT_AMP\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DPLATFORM=tgl"
132133
"sof-tgl-rt711-rt1308\;sof-tgl-rt711-4ch\;-DCHANNELS=4\;-DDMICPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_48khz.m4\;-DDMIC16KPROC_FILTER1=eq_iir_coef_highpass_40hz_20db_16khz.m4\;-DPLATFORM=tgl"

tools/topology/topology1/sof-icl-rt711-rt1308-rt715-hdmi.m4

Lines changed: 51 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,37 @@ ifdef(`MIC_LINK',`',
4040
# HDMI ID calculated based on the configuraiton
4141
define(HDMI_BE_ID_BASE, `0')
4242

43+
# SDW Pin as DAIs index starts from 2 on each SDW link
44+
define(`ALH_PIN2', `2')
45+
define(`ALH_PIN3', eval(ALH_PIN2) + 1)
46+
define(`ALH_PIN4', eval(ALH_PIN2))
47+
define(`ALH_PIN5', eval(ALH_PIN2))
48+
49+
define(`ALH_JACK_OUT_NAME', `SDW'eval(UAJ_LINK)`-Playback')
50+
define(`ALH_JACK_IN_NAME', `SDW'eval(UAJ_LINK)`-Capture')
51+
define(`ALH_AMP_OUT_NAME', `SDW'eval(AMP_1_LINK)`-Playback')
52+
define(`ALH_MIC_IN_NAME', `SDW'eval(MIC_LINK)`-Capture')
53+
54+
# Reorder to match multi-function codec dai index on single SDW link
55+
ifdef(`MFC', `
56+
undefine(`ALH_PIN3')
57+
undefine(`ALH_PIN4')
58+
undefine(`ALH_PIN5')
59+
define(`ALH_PIN3', eval(ALH_PIN2) + 2)
60+
define(`ALH_PIN4', eval(ALH_PIN2) + 3)
61+
define(`ALH_PIN5', eval(ALH_PIN2) + 1)
62+
63+
# align the partial string match of full dai link name
64+
undefine(`ALH_JACK_OUT_NAME')
65+
undefine(`ALH_JACK_IN_NAME')
66+
undefine(`ALH_AMP_OUT_NAME')
67+
undefine(`ALH_MIC_IN_NAME')
68+
define(`ALH_JACK_OUT_NAME', `Playback-SimpleJack')
69+
define(`ALH_JACK_IN_NAME', `Capture-SimpleJack')
70+
define(`ALH_AMP_OUT_NAME', `Playback-SmartAmp')
71+
define(`ALH_MIC_IN_NAME', `Capture-SmartMic')'
72+
)
73+
4374
ifdef(`NO_JACK', `',
4475
`undefine(`HDMI_BE_ID_BASE')
4576
define(HDMI_BE_ID_BASE, `2')'
@@ -106,16 +137,16 @@ ifdef(`NOJACK', `',
106137
`
107138
# PCM0 ---> volume ----> mixer --->ALH 2 BE UAJ_LINK
108139
# PCM31 ---> volume ------^
109-
# PCM1 <--- volume <---- ALH 3 BE UAJ_LINK
140+
# PCM1 <--- volume <---- ALH 3/4 BE UAJ_LINK
110141
')
111142
ifdef(`NOAMP', `',
112143
`
113-
# PCM2 ---> volume ----> ALH 2 BE AMP_1_LINK
144+
# PCM2 ---> volume ----> ALH 2/5 BE AMP_1_LINK
114145
ifdef(`MONO', `',
115-
`# PCM40 ---> volume ----> ALH 2 BE AMP_2_LINK')
146+
`# PCM40 ---> volume ----> ALH 2/5 BE AMP_2_LINK')
116147
')
117148
ifdef(`NO_LOCAL_MIC', `',
118-
`# PCM4 <--- volume <---- ALH 2 BE MIC_LINK')
149+
`# PCM4 <--- volume <---- ALH 2/3 BE MIC_LINK')
119150

120151
ifdef(`NOHDMI', `',
121152
`
@@ -215,14 +246,14 @@ ifdef(`NOJACK', `',
215246
# The NOT_USED_IGNORED is due to dependencies and is adjusted later with an explicit dapm line.
216247

217248
DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4,
218-
1, ALH, eval(UAJ_LINK * 256 + 2), `SDW'eval(UAJ_LINK)`-Playback',
249+
1, ALH, eval(UAJ_LINK * 256 + ALH_PIN2), ALH_JACK_OUT_NAME,
219250
NOT_USE_IGNORED, 2, s24le,
220251
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER, 2, 48000)
221252

222253
# capture DAI is ALH(UAJ_LINK PIN3) using 2 periods
223254
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
224255
DAI_ADD(sof/pipe-dai-capture.m4,
225-
2, ALH, eval(UAJ_LINK * 256 + 3), `SDW'eval(UAJ_LINK)`-Capture',
256+
2, ALH, eval(UAJ_LINK * 256 + ALH_PIN3), ALH_JACK_IN_NAME,
226257
PIPELINE_SINK_2, 2, s24le,
227258
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
228259

@@ -271,13 +302,13 @@ ifdef(`NOAMP', `',
271302
# playback DAI is ALH(AMP_1_LINK PIN2/AMP_2_LINK PIN2) using 2 periods
272303
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
273304
DAI_ADD(sof/pipe-dai-playback.m4,
274-
3, ALH, eval(AMP_1_LINK * 256 + 2), `SDW'eval(AMP_1_LINK)`-Playback',
305+
3, ALH, eval(AMP_1_LINK * 256 + ALH_PIN4), ALH_AMP_OUT_NAME,
275306
PIPELINE_SOURCE_3, 2, s24le,
276307
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
277308

278309
ifdef(`MONO', `',
279310
`DAI_ADD_SCHED(sof/pipe-dai-sched-playback.m4,
280-
4, ALH, eval(AMP_2_LINK * 256 + 2), `SDW'eval(AMP_1_LINK)`-Playback',
311+
4, ALH, eval(AMP_2_LINK * 256 + ALH_PIN4), ALH_AMP_OUT_NAME,
281312
PIPELINE_SOURCE_4, 2, s24le,
282313
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER,
283314
PIPELINE_PLAYBACK_SCHED_COMP_3)
@@ -299,7 +330,7 @@ ifdef(`NO_LOCAL_MIC', `',
299330
# capture DAI is ALH(MIC_LINK PIN2) using 2 periods
300331
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
301332
DAI_ADD(sof/pipe-dai-capture.m4,
302-
5, ALH, eval(MIC_LINK * 256 + 2), `SDW'eval(MIC_LINK)`-Capture',
333+
5, ALH, eval(MIC_LINK * 256 + ALH_PIN5), ALH_MIC_IN_NAME,
303334
PIPELINE_SINK_5, 2, s24le,
304335
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
305336
')
@@ -362,26 +393,26 @@ ifdef(`NOJACK', `',
362393
`
363394
#ALH dai index = ((link_id << 8) | PDI id)
364395
#ALH UAJ_LINK Pin2 (ID: 0)
365-
DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 2), 0, `SDW'eval(UAJ_LINK)`-Playback',
366-
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 2), 48000, 2)))
396+
DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + ALH_PIN2), 0, ALH_JACK_OUT_NAME,
397+
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + ALH_PIN2), 48000, 2)))
367398

368-
#ALH UAJ_LINK Pin3 (ID: 1)
369-
DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 3), 1, `SDW'eval(UAJ_LINK)`-Capture',
370-
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 3), 48000, 2)))
399+
#ALH UAJ_LINK Pin3/4 (ID: 1)
400+
DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + ALH_PIN3), 1, ALH_JACK_IN_NAME,
401+
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + ALH_PIN3), 48000, 2)))
371402
')
372403

373404
ifdef(`NOAMP', `',
374405
`
375-
#ALH AMP_1_LINK Pin2 (ID: 2)
376-
DAI_CONFIG(ALH, eval(AMP_1_LINK * 256 + 2), 2, `SDW'eval(AMP_1_LINK)`-Playback',
377-
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_1_LINK * 256 + 2), 48000, 2)))
406+
#ALH AMP_1_LINK Pin2/5 (ID: 2)
407+
DAI_CONFIG(ALH, eval(AMP_1_LINK * 256 + ALH_PIN4), 2, ALH_AMP_OUT_NAME,
408+
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_1_LINK * 256 + ALH_PIN4), 48000, 2)))
378409
')
379410

380411
ifdef(`NO_LOCAL_MIC', `',
381412
`
382-
#ALH MIC_LINK Pin2 (ID: 4)
383-
DAI_CONFIG(ALH, eval(MIC_LINK * 256 + 2), 4, `SDW'eval(MIC_LINK)`-Capture',
384-
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(MIC_LINK * 256 + 2), 48000, 2)))
413+
#ALH MIC_LINK Pin2/3 (ID: 4)
414+
DAI_CONFIG(ALH, eval(MIC_LINK * 256 + ALH_PIN5), 4, ALH_MIC_IN_NAME,
415+
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(MIC_LINK * 256 + ALH_PIN5), 48000, 2)))
385416
')
386417

387418
ifdef(`NOHDMI', `',

0 commit comments

Comments
 (0)