Skip to content

Commit 6d8b40d

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 0ea4bdc commit 6d8b40d

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

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 ----> ALH 2 BE dailink 0
75-
# PCM1 <--- volume <---- ALH 3 BE dailink 1
74+
# PCM0 ---> volume ----> 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
@@ -169,22 +169,22 @@ dnl deadline, priority, core, time_domain)
169169

170170
ifdef(`NOJACK', `',
171171
`
172-
# playback DAI is ALH(SDW0 PIN2) using 2 periods
172+
# playback DAI is ALH(UAJ_LINK PIN2) using 2 periods
173173
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
174174
DAI_ADD(sof/pipe-dai-playback.m4,
175175
1, ALH, eval(UAJ_LINK * 256 + 2), `SDW'eval(UAJ_LINK)`-Playback',
176176
PIPELINE_SOURCE_1, 2, s24le,
177177
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
178178

179-
# capture DAI is ALH(SDW0 PIN2) using 2 periods
179+
# capture DAI is ALH(UAJ_LINK PIN3) using 2 periods
180180
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
181181
DAI_ADD(sof/pipe-dai-capture.m4,
182182
2, ALH, eval(UAJ_LINK * 256 + 3), `SDW'eval(UAJ_LINK)`-Capture',
183183
PIPELINE_SINK_2, 2, s24le,
184184
1000, 0, 0, SCHEDULE_TIME_DOMAIN_TIMER)
185185
')
186186

187-
# playback DAI is ALH(SDW1 PIN2) using 2 periods
187+
# playback DAI is ALH(AMP_1_LINK PIN2/AMP_2_LINK PIN2) using 2 periods
188188
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
189189
DAI_ADD(sof/pipe-dai-playback.m4,
190190
3, ALH, eval(AMP_1_LINK * 256 + 2), `SDW'eval(AMP_1_LINK)`-Playback',
@@ -209,7 +209,7 @@ SectionGraph."PIPE_DEMUX" {
209209
}
210210
')
211211

212-
# capture DAI is ALH(SDW3 PIN2) using 2 periods
212+
# capture DAI is ALH(MIC_LINK PIN2) using 2 periods
213213
# Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0
214214
DAI_ADD(sof/pipe-dai-capture.m4,
215215
5, ALH, eval(MIC_LINK * 256 + 2), `SDW'eval(MIC_LINK)`-Capture',
@@ -259,20 +259,20 @@ PCM_PLAYBACK_ADD(HDMI 3, 7, PIPELINE_PCM_8)
259259
ifdef(`NOJACK', `',
260260
`
261261
#ALH dai index = ((link_id << 8) | PDI id)
262-
#ALH SDW0 Pin2 (ID: 0)
262+
#ALH UAJ_LINK Pin2 (ID: 0)
263263
DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 2), 0, `SDW'eval(UAJ_LINK)`-Playback',
264264
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 2), 48000, 2)))
265265

266-
#ALH SDW0 Pin3 (ID: 1)
266+
#ALH UAJ_LINK Pin3 (ID: 1)
267267
DAI_CONFIG(ALH, eval(UAJ_LINK * 256 + 3), 1, `SDW'eval(UAJ_LINK)`-Capture',
268268
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(UAJ_LINK * 256 + 3), 48000, 2)))
269269
')
270270

271-
#ALH SDW1 Pin2 (ID: 2)
271+
#ALH AMP_1_LINK Pin2 (ID: 2)
272272
DAI_CONFIG(ALH, eval(AMP_1_LINK * 256 + 2), 2, `SDW'eval(AMP_1_LINK)`-Playback',
273273
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(AMP_1_LINK * 256 + 2), 48000, 2)))
274274

275-
#ALH SDW3 Pin2 (ID: 4)
275+
#ALH MIC_LINK Pin2 (ID: 4)
276276
DAI_CONFIG(ALH, eval(MIC_LINK * 256 + 2), 4, `SDW'eval(MIC_LINK)`-Capture',
277277
ALH_CONFIG(ALH_CONFIG_DATA(ALH, eval(MIC_LINK * 256 + 2), 48000, 2)))
278278

0 commit comments

Comments
 (0)