From 138b5889c06b2a60b2fbf4cc565d0737a5379def Mon Sep 17 00:00:00 2001 From: Jyri Sarha Date: Thu, 25 May 2023 18:43:00 +0300 Subject: [PATCH 1/2] topology2: cavs-nocodec.conf: Rename ssp-capture and DMIC0 Raw PCMs Rename cavs-nocodec capture PCMs. The current PCM names are confusing. These should be better names for them. The former "ssp-capture" is now "Port0 2nd Capture", "DMIC0 Raw" is now "DMIC SFX1", and "DMIC0 Raw 2" is now "DMIC SFX2". The PCMs in question have extra gains in the path to simulate processing. Also the mixer name is changed to compensate for the matching "Capture" substring in the end of the PCM name, that is part of the mixer name, to avoid "Capture Capture" tautology. Signed-off-by: Jyri Sarha --- tools/topology/topology2/cavs-nocodec.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf index ffea7326a076..91e43be5aa29 100644 --- a/tools/topology/topology2/cavs-nocodec.conf +++ b/tools/topology/topology2/cavs-nocodec.conf @@ -83,11 +83,11 @@ Define { SSP1_ENABLED "true" PASSTHROUGH "false" SSP0_PCM_NAME "Port0" - SSP0_CAPTURE_PCM "ssp-capture" + SSP0_CAPTURE_PCM "Port0 2nd Capture" SSP1_PCM_NAME "Port1" SSP2_PCM_NAME "Port2" - DMIC0_PCM_0_NAME "DMIC0 Raw" - DMIC0_PCM_1_NAME "DMIC0 Raw 2" + DMIC0_PCM_0_NAME "DMIC SFX1" + DMIC0_PCM_1_NAME "DMIC SFX2" } # override defaults with platform-specific config @@ -284,7 +284,7 @@ IncludeByKey.PASSTHROUGH { } Object.Widget.gain.1 { Object.Control.mixer.1 { - name 'Post Demux $SSP0_CAPTURE_PCM Capture Volume' + name 'Post Demux $SSP0_CAPTURE_PCM Volume' } } } From 26d3dd4aa9224f7fb35ac9ac92e19e755f2528b0 Mon Sep 17 00:00:00 2001 From: Jyri Sarha Date: Fri, 26 May 2023 00:02:49 +0300 Subject: [PATCH 2/2] topology2: dmic-generic.conf: Rename "DMIC" PCM name to "DMIC Raw" Rename "DMIC" PCM name to "DMIC Raw" in the generic dmic topology fragment. The PCM is on the DMIC patch without any processing beyond gain and IIR EQ, thus the "Raw" extension. Signed-off-by: Jyri Sarha --- tools/topology/topology2/platform/intel/dmic-generic.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/topology/topology2/platform/intel/dmic-generic.conf b/tools/topology/topology2/platform/intel/dmic-generic.conf index 9d0ba0793100..6630d4045266 100644 --- a/tools/topology/topology2/platform/intel/dmic-generic.conf +++ b/tools/topology/topology2/platform/intel/dmic-generic.conf @@ -1,5 +1,5 @@ Define { - DMIC0_PCM_NAME "DMIC" + DMIC0_PCM_NAME "DMIC Raw" } Object.Dai.DMIC [