OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <jyri.sarha@linux.intel.com>
This commit is contained in:
Jyri Sarha 2023-05-29 19:56:09 +03:00 committed by Kai Vehmanen
parent a0b1a391b8
commit 2cef521c36
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/topology/topology2/cavs-nocodec-multicore.conf
View File

@ -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 {