From 2967b3849eb4301fdf7b64947c32cfeb8a602982 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 5 Nov 2026 13:56:36 +0200 Subject: [PATCH] topology2: uaol: Name the PCMs "USB Offload " The frontend PCMs of the UAOL topologies are named after the link they run on, "UAOL0" and "UAOL1". What the user sees in aplay -l should say what the PCM is for, not which link carries it: "UAOL" is the name of Intel's link in the specifications and in the DAI names, the function is USB audio offload. Name the PCMs "USB Offload 0" and "USB Offload 1", with the deep buffers following as "Deepbuffer USB Offload " like "Deepbuffer HDA Analog" does. This also pairs them by name with the kernel's "USB Offload Playback Route" / "USB Offload Capture Route" controls and the "USB Offload Jack", so that PCM, route control and jack of a stream share one name and the number tells them apart. The mixer volume controls derive their names from the PCM and follow along. The DAI copiers and the backend DAI links keep their UAOL names: those are the link and are matched by the machine driver. Signed-off-by: Peter Ujfalusi --- tools/topology/topology2/cavs-uaol.conf | 16 ++++++++-------- .../development/sof-hda-generic-uaol.conf | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tools/topology/topology2/cavs-uaol.conf b/tools/topology/topology2/cavs-uaol.conf index a351ca1e9f7a..85ee38b5401e 100644 --- a/tools/topology/topology2/cavs-uaol.conf +++ b/tools/topology/topology2/cavs-uaol.conf @@ -42,8 +42,8 @@ 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 @@ -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 @@ -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 @@ -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 } diff --git a/tools/topology/topology2/development/sof-hda-generic-uaol.conf b/tools/topology/topology2/development/sof-hda-generic-uaol.conf index bb3ffcd1501b..d997a90210a9 100644 --- a/tools/topology/topology2/development/sof-hda-generic-uaol.conf +++ b/tools/topology/topology2/development/sof-hda-generic-uaol.conf @@ -34,8 +34,8 @@ 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 @@ -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 @@ -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 @@ -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 }