Skip to content

Commit ee3631a

Browse files
libinyanglgirdwood
authored andcommitted
topology1: sof-icl-rt711-rt1308-rt715-hdmi: correct the link description
The links are dynamically assigned. The descriptions should be changed correspondingly. Signed-off-by: Libin Yang <libin.yang@intel.com>
1 parent 3904756 commit ee3631a

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ MUXDEMUX_CONFIG(demux_priv_3, 2, LIST(` ', `matrix1,', `matrix2'))
7171
#
7272
ifdef(`NOJACK', `',
7373
`
74-
# PCM0 ---> volume ----> mixer --->ALH 2 BE dailink 0
75-
# PCM1 <--- volume <---- ALH 3 BE dailink 1
74+
# PCM0 ---> volume ----> mixer --->ALH 2 BE UAJ_LINK
75+
# PCM1 <--- volume <---- ALH 3 BE UAJ_LINK
7676
')
77-
# PCM2 ---> volume ----> ALH 2 BE dailink 2
77+
# PCM2 ---> volume ----> ALH 2 BE AMP_1_LINK
7878
ifdef(`MONO', `',
79-
`# PCM40 ---> volume ----> ALH 2 BE dailink 3')
80-
# PCM4 <--- volume <---- ALH 2 BE dailink 4
79+
`# PCM40 ---> volume ----> ALH 2 BE AMP_2_LINK')
80+
# PCM4 <--- volume <---- ALH 2 BE MIC_LINK
8181
# PCM5 ---> volume ----> iDisp1
8282
# PCM6 ---> volume ----> iDisp2
8383
# PCM7 ---> volume ----> iDisp3
@@ -162,7 +162,7 @@ dnl deadline, priority, core, time_domain)
162162

163163
ifdef(`NOJACK', `',
164164
`
165-
# playback DAI is ALH(SDW0 PIN2) using 2 periods
165+
# playback DAI is ALH(UAJ_LINK PIN2) using 2 periods
166166
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
167167
# The NOT_USED_IGNORED is due to dependencies and is adjusted later with an explicit dapm line.
168168

@@ -171,7 +171,7 @@ DAI_ADD(sof/pipe-mixer-volume-dai-playback.m4,
171171
NOT_USE_IGNORED, 2, s24le,
172172
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER, 2, 48000)
173173

174-
# capture DAI is ALH(SDW0 PIN2) using 2 periods
174+
# capture DAI is ALH(UAJ_LINK PIN3) using 2 periods
175175
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
176176
DAI_ADD(sof/pipe-dai-capture.m4,
177177
2, ALH, eval(UAJ_LINK * 256 + 3), `SDW'eval(UAJ_LINK)`-Capture',
@@ -199,7 +199,7 @@ SectionGraph."mixer-host" {
199199
'
200200
)
201201

202-
# playback DAI is ALH(SDW1 PIN2) using 2 periods
202+
# playback DAI is ALH(AMP_1_LINK PIN2/AMP_2_LINK PIN2) using 2 periods
203203
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
204204
DAI_ADD(sof/pipe-dai-playback.m4,
205205
3, ALH, eval(AMP_1_LINK * 256 + 2), `SDW'eval(AMP_1_LINK)`-Playback',
@@ -224,7 +224,7 @@ SectionGraph."PIPE_DEMUX" {
224224
}
225225
')
226226

227-
# capture DAI is ALH(SDW3 PIN2) using 2 periods
227+
# capture DAI is ALH(MIC_LINK PIN2) using 2 periods
228228
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
229229
DAI_ADD(sof/pipe-dai-capture.m4,
230230
5, ALH, eval(MIC_LINK * 256 + 2), `SDW'eval(MIC_LINK)`-Capture',
@@ -274,20 +274,20 @@ PCM_PLAYBACK_ADD(HDMI 3, 7, PIPELINE_PCM_8)
274274
ifdef(`NOJACK', `',
275275
`
276276
#ALH dai index = ((link_id << 8) | PDI id)
277-
#ALH SDW0 Pin2 (ID: 0)
277+
#ALH UAJ_LINK Pin2 (ID: 0)
278278
DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 2), 0, `SDW'eval(UAJ_LINK)`-Playback',
279279
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 2), 48000, 2)))
280280

281-
#ALH SDW0 Pin3 (ID: 1)
281+
#ALH UAJ_LINK Pin3 (ID: 1)
282282
DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 3), 1, `SDW'eval(UAJ_LINK)`-Capture',
283283
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 3), 48000, 2)))
284284
')
285285

286-
#ALH SDW1 Pin2 (ID: 2)
286+
#ALH AMP_1_LINK Pin2 (ID: 2)
287287
DAI_CONFIG(ALH, eval(AMP_1_LINK * 256 + 2), 2, `SDW'eval(AMP_1_LINK)`-Playback',
288288
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_1_LINK * 256 + 2), 48000, 2)))
289289

290-
#ALH SDW3 Pin2 (ID: 4)
290+
#ALH MIC_LINK Pin2 (ID: 4)
291291
DAI_CONFIG(ALH, eval(MIC_LINK * 256 + 2), 4, `SDW'eval(MIC_LINK)`-Capture',
292292
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(MIC_LINK * 256 + 2), 48000, 2)))
293293

0 commit comments

Comments
 (0)