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

topology2: cavs-nocodec.conf: Rename SSP0, SSP1, and SSP2 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 in sof-tgl-nocodec.tplg:

'gain.1.1 Playback Volume 1' > 'gain.1.1 Pre Mixer Port0 Playback Volume'
'gain.2.1 Main Playback Volume 2' > 'gain.2.1 Post Mixer Port0 Playback Volume'
'gain.3.1 Playback Volume 3' > 'gain.3.1 Pre Mixer Port1 Playback Volume'
'gain.5.1 Playback Volume 5' > 'gain.5.1 Pre Mixer Port2 Playback Volume'
'gain.6.1 Main Playback Volume 6' > '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-18 21:52:20 +03:00 committed by Kai Vehmanen
parent 3d54d14f3f
commit 76310a0a0e
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/topology/topology2/cavs-nocodec.conf
View File

@ -82,6 +82,9 @@ Define {
SSP0_MIXER_SOURCE_3 'mixin.21.1'
SSP1_ENABLED "true"
PASSTHROUGH "false"
SSP0_PCM_NAME "Port0"
SSP1_PCM_NAME "Port1"
SSP2_PCM_NAME "Port2"
}
# override defaults with platform-specific config
@ -180,7 +183,7 @@ IncludeByKey.PASSTHROUGH {
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Playback Volume 1'
name 'Pre Mixer $SSP0_PCM_NAME Playback Volume'
}
}
}
@ -193,7 +196,7 @@ IncludeByKey.PASSTHROUGH {
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Playback Volume 5'
name 'Pre Mixer $SSP2_PCM_NAME Playback Volume'
}
}
}
@ -213,7 +216,7 @@ IncludeByKey.PASSTHROUGH {
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Main Playback Volume 2'
name 'Post Mixer $SSP0_PCM_NAME Playback Volume'
}
}
@ -248,7 +251,7 @@ IncludeByKey.PASSTHROUGH {
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Main Playback Volume 6'
name 'Post Mixer $SSP2_PCM_NAME Playback Volume'
}
}
}
@ -747,11 +750,11 @@ IncludeByKey.PASSTHROUGH {
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 {
@ -767,11 +770,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 {
@ -1018,7 +1021,7 @@ IncludeByKey.SSP1_ENABLED {
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Playback Volume 3'
name 'Pre Mixer $SSP1_PCM_NAME Playback Volume'
}
}
}
@ -1038,7 +1041,7 @@ IncludeByKey.SSP1_ENABLED {
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Main Playback Volume 4'
name 'Post Mixer $SSP1_PCM_NAME Playback Volume'
}
}
}
@ -1133,11 +1136,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 {