Skip to content

topology2: uaol: Name the PCMs "USB Offload <n>" #11406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 1 commit into from
Nov 6, 2026
Merged

topology2: uaol: Name the PCMs "USB Offload <n>" #11406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tools/topology/topology2/cavs-uaol.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<host.conf>

Define {
UAOL_PLAYBACK_PCM 'UAOL0 Playback'
UAOL_CAPTURE_PCM 'UAOL0 Capture'
UAOL_PLAYBACK_PCM 'USB Offload 0 Playback'
UAOL_CAPTURE_PCM 'USB Offload 0 Capture'
# The two directions are separate DAI links so that the format fixup of
# a link is decided by the DAI copier of that direction alone, and the
# link carries two streams per direction, each with a backend of its
Expand All @@ -59,7 +59,7 @@ Define {
UAOL_CP_BE_ID 10
# UAOL_DAI_INDEX is the UAOL link the DSP uses, only link 0 is addressable
UAOL_DAI_INDEX 0
UAOL_PCM_NAME 'UAOL0'
UAOL_PCM_NAME 'USB Offload 0'
UAOL_PCM_ID 21
UAOL_PB_HOST_PIPELINE_ID 210
UAOL_PB_DAI_PIPELINE_ID 211
Expand All @@ -68,13 +68,13 @@ Define {

# Second stream pair of the link, on its own PCM
UAOL_NUM_STREAMS 2
UAOL_PLAYBACK1_PCM 'UAOL1 Playback'
UAOL_CAPTURE1_PCM 'UAOL1 Capture'
UAOL_PLAYBACK1_PCM 'USB Offload 1 Playback'
UAOL_CAPTURE1_PCM 'USB Offload 1 Capture'
UAOL_PB1_DAI_NAME 'UAOL0-Play1'
UAOL_CP1_DAI_NAME 'UAOL0-Cap1'
UAOL_PB1_BE_ID 11
UAOL_CP1_BE_ID 12
UAOL_PCM1_NAME 'UAOL1'
UAOL_PCM1_NAME 'USB Offload 1'
UAOL_PCM1_ID 22
UAOL_PB1_HOST_PIPELINE_ID 215
UAOL_PB1_DAI_PIPELINE_ID 216
Expand All @@ -94,10 +94,10 @@ Define {
# The deep buffer PCMs feed the same mixer as the normal playback PCM of
# their stream
UAOL_DEEP_BUFFER 'true'
UAOL_DB_PCM_NAME 'Deepbuffer UAOL0'
UAOL_DB_PCM_NAME 'Deepbuffer USB Offload 0'
UAOL_DB_PCM_ID 23
UAOL_DB_PIPELINE_ID 214
UAOL_DB1_PCM_NAME 'Deepbuffer UAOL1'
UAOL_DB1_PCM_NAME 'Deepbuffer USB Offload 1'
UAOL_DB1_PCM_ID 24
UAOL_DB1_PIPELINE_ID 219
}
Expand Down
16 changes: 8 additions & 8 deletions tools/topology/topology2/development/sof-hda-generic-uaol.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<output_audio_format.conf>

Define {
UAOL_PLAYBACK_PCM 'UAOL0 Playback'
UAOL_CAPTURE_PCM 'UAOL0 Capture'
UAOL_PLAYBACK_PCM 'USB Offload 0 Playback'
UAOL_CAPTURE_PCM 'USB Offload 0 Capture'
# The two directions are separate DAI links so that the format fixup of
# a link is decided by the DAI copier of that direction alone, and the
# link carries two streams per direction, each with a backend of its
Expand All @@ -52,7 +52,7 @@ Define {
UAOL_CP_BE_ID 10
# UAOL_DAI_INDEX is the UAOL link the DSP uses, only link 0 is addressable
UAOL_DAI_INDEX 0
UAOL_PCM_NAME 'UAOL0'
UAOL_PCM_NAME 'USB Offload 0'
UAOL_PCM_ID 21
UAOL_PB_HOST_PIPELINE_ID 210
UAOL_PB_DAI_PIPELINE_ID 211
Expand All @@ -64,13 +64,13 @@ Define {
# routes point at it and the second PCM fails with EBUSY while the first
# one runs, a second device or a second PCM of the first lets both run
UAOL_NUM_STREAMS 2
UAOL_PLAYBACK1_PCM 'UAOL1 Playback'
UAOL_CAPTURE1_PCM 'UAOL1 Capture'
UAOL_PLAYBACK1_PCM 'USB Offload 1 Playback'
UAOL_CAPTURE1_PCM 'USB Offload 1 Capture'
UAOL_PB1_DAI_NAME 'UAOL0-Play1'
UAOL_CP1_DAI_NAME 'UAOL0-Cap1'
UAOL_PB1_BE_ID 11
UAOL_CP1_BE_ID 12
UAOL_PCM1_NAME 'UAOL1'
UAOL_PCM1_NAME 'USB Offload 1'
UAOL_PCM1_ID 22
UAOL_PB1_HOST_PIPELINE_ID 215
UAOL_PB1_DAI_PIPELINE_ID 216
Expand All @@ -90,10 +90,10 @@ Define {
# The deep buffer PCMs feed the same mixer as the normal playback PCM of
# their stream, next to the one the HDA playback has
UAOL_DEEP_BUFFER 'true'
UAOL_DB_PCM_NAME 'Deepbuffer UAOL0'
UAOL_DB_PCM_NAME 'Deepbuffer USB Offload 0'
UAOL_DB_PCM_ID 23
UAOL_DB_PIPELINE_ID 214
UAOL_DB1_PCM_NAME 'Deepbuffer UAOL1'
UAOL_DB1_PCM_NAME 'Deepbuffer USB Offload 1'
UAOL_DB1_PCM_ID 24
UAOL_DB1_PIPELINE_ID 219
}
Expand Down
Loading