From c3e928248881a015892a8e4dd003e6af1918ee60 Mon Sep 17 00:00:00 2001 From: Jyri Sarha Date: Sun, 28 May 2023 22:54:33 +0300 Subject: [PATCH 1/3] topology2: cavs-mixin-mixout-efx-hda.conf: Improve mixer names Rename mixin and mixout EFX Analog Playback volumes. Rewrite the names of the mixers to better reflect their position in the topology. As a result of this commit mixers are renamed in sof-hda-efx-generic.tplg as follows: 'gain.1.1 1 2nd Playback Volume' to 'gain.1.1 Pre Mixer Analog Playback Volume' and 'gain.2.1 2 Main Playback Volume' to 'gain.2.1 Post Mixer Analog Playback Volume' Signed-off-by: Jyri Sarha --- tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf index a37b8fc58243..f6adbaae4a86 100644 --- a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf +++ b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf @@ -40,7 +40,7 @@ Object.Pipeline { } Object.Widget.gain.1 { Object.Control.mixer.1 { - name '2 Main Playback Volume' + name 'Post Mixer $ANALOG_PLAYBACK_PCM Volume' } } Object.Widget.eqiir.1 { @@ -67,7 +67,7 @@ Object.Pipeline { Object.Widget.gain.1 { Object.Control.mixer.1 { - name '1 2nd Playback Volume' + name 'Pre Mixer $ANALOG_PLAYBACK_PCM Volume' } } } From d66d3c77a76fc23e0e91e8194b8117ce3a77190a Mon Sep 17 00:00:00 2001 From: Jyri Sarha Date: Sun, 28 May 2023 23:18:29 +0300 Subject: [PATCH 2/3] topology2: cavs-mixin-mixout-efx-hda.conf: Rename Iir and Fir Eqs Rename mixin and mixout EFX Analog Playback Eqs to follow the same naming scheme as the mixers. As a result of this commit Eqs are renamed in sof-hda-efx-generic.tplg as follows: 'eqfir.2.1 2 Main playback Fir Eq' to 'eqfir.2.1 Post Mixer Analog Playback Fir Eq' and 'eqiir.2.1 2 Main playback Iir Eq' to 'eqiir.2.1 Post Mixer Analog Playback Iir Eq' Signed-off-by: Jyri Sarha --- tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf index f6adbaae4a86..f5eb2318a199 100644 --- a/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf +++ b/tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf @@ -45,12 +45,12 @@ Object.Pipeline { } Object.Widget.eqiir.1 { Object.Control.bytes."1" { - name '2 Main playback Iir Eq' + name 'Post Mixer $ANALOG_PLAYBACK_PCM Iir Eq' } } Object.Widget.eqfir.1 { Object.Control.bytes."1" { - name '2 Main playback Fir Eq' + name 'Post Mixer $ANALOG_PLAYBACK_PCM Fir Eq' } } } From e1d2482e42e76d6e5de32cb3b132a0c7207d097c Mon Sep 17 00:00:00 2001 From: Jyri Sarha Date: Mon, 29 May 2023 19:56:09 +0300 Subject: [PATCH 3/3] topology2: cavs-nocodec-multicore.conf: Rename playback volumes Rename SSP0, SSP1, and SSP2 playback volumes according to PCM names they are connected to. Define the PCM names as variables so the name can be changed in a single place. This is how the change will look like: 'gain.1.1 Playback Volume 1' to 'gain.1.1 Pre Mixer Port0 Playback Volume' 'gain.14.1 Main Playback Volume 14' to 'gain.14.1 Post Mixer Port0 Playback Volume' 'gain.3.1 Playback Volume 3' to 'gain.3.1 Pre Mixer Port1 Playback Volume' 'gain.4.1 Main Playback Volume 4' to 'gain.4.1 Post Mixer Port1 Playback Volume' 'gain.5.1 Playback Volume 5' to 'gain.5.1 Pre Mixer Port2 Playback Volume' 'gain.6.1 Main Playback Volume 6' to 'gain.6.1 Post Mixer Port2 Playback Volume' Signed-off-by: Jyri Sarha --- .../topology2/cavs-nocodec-multicore.conf | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tools/topology/topology2/cavs-nocodec-multicore.conf b/tools/topology/topology2/cavs-nocodec-multicore.conf index 7f4e82ad6016..6ba1fabff137 100644 --- a/tools/topology/topology2/cavs-nocodec-multicore.conf +++ b/tools/topology/topology2/cavs-nocodec-multicore.conf @@ -61,6 +61,10 @@ Define { DMIC1_PCM_CAPS 'DMIC1 WOV Capture' DMIC0_NAME 'NoCodec-6' DMIC1_NAME 'NoCodec-7' + + SSP0_PCM_NAME "Port0" + SSP1_PCM_NAME "Port1" + SSP2_PCM_NAME "Port2" } # override defaults with platform-specific config @@ -147,7 +151,7 @@ Object.Pipeline.host-copier-gain-mixin-playback [ Object.Widget.gain.1 { core_id $SSP0_CORE_ID Object.Control.mixer.1 { - name 'Playback Volume 1' + name 'Pre Mixer $SSP0_PCM_NAME Playback Volume' } } } @@ -163,7 +167,7 @@ Object.Pipeline.host-copier-gain-mixin-playback [ Object.Widget.gain.1 { core_id $SSP2_CORE_ID Object.Control.mixer.1 { - name 'Playback Volume 5' + name 'Pre Mixer $SSP2_PCM_NAME Playback Volume' } } Object.Widget.mixin.1 { @@ -189,7 +193,7 @@ Object.Pipeline.mixout-gain-dai-copier-playback [ Object.Widget.gain.1 { core_id $SSP0_CORE_ID Object.Control.mixer.1 { - name 'Main Playback Volume 14' + name 'Post Mixer $SSP0_PCM_NAME Playback Volume' } } } @@ -209,7 +213,7 @@ Object.Pipeline.mixout-gain-dai-copier-playback [ Object.Widget.gain.1 { core_id $SSP2_CORE_ID Object.Control.mixer.1 { - name 'Main Playback Volume 6' + name 'Post Mixer $SSP2_PCM_NAME Playback Volume' } } Object.Widget.mixout.1 { @@ -292,11 +296,11 @@ Object.Pipeline.io-gateway-capture [ Object.PCM.pcm [ { - name "Port0" + name "$SSP0_PCM_NAME" id 0 direction "duplex" Object.Base.fe_dai.1 { - name "Port0" + name "$SSP0_PCM_NAME" } Object.PCM.pcm_caps.1 { @@ -312,11 +316,11 @@ Object.PCM.pcm [ } } { - name "Port2" + name "$SSP2_PCM_NAME" id 2 direction "duplex" Object.Base.fe_dai.1 { - name "Port2" + name "$SSP2_PCM_NAME" } Object.PCM.pcm_caps.1 { @@ -409,7 +413,7 @@ IncludeByKey.SSP1_ENABLED { Object.Widget.gain.1 { core_id $SSP1_CORE_ID Object.Control.mixer.1 { - name 'Playback Volume 3' + name 'Pre Mixer $SSP1_PCM_NAME Playback Volume' } } Object.Widget.mixin.1 { @@ -435,7 +439,7 @@ IncludeByKey.SSP1_ENABLED { Object.Widget.gain.1 { core_id $SSP1_CORE_ID Object.Control.mixer.1 { - name 'Main Playback Volume 4' + name 'Post Mixer $SSP1_PCM_NAME Playback Volume' } } Object.Widget.mixout.1 { @@ -485,11 +489,11 @@ IncludeByKey.SSP1_ENABLED { Object.PCM.pcm [ { - name "Port1" + name "$SSP1_PCM_NAME" id 1 direction "duplex" Object.Base.fe_dai.1 { - name "Port1" + name "$SSP1_PCM_NAME" } Object.PCM.pcm_caps.1 {