Skip to content

Commit 2cef521

Browse files
Jyri Sarhakv2019i
authored andcommitted
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>
1 parent a0b1a39 commit 2cef521

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

tools/topology/topology2/cavs-nocodec-multicore.conf

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ Define {
6161
DMIC1_PCM_CAPS 'DMIC1 WOV Capture'
6262
DMIC0_NAME 'NoCodec-6'
6363
DMIC1_NAME 'NoCodec-7'
64+
65+
SSP0_PCM_NAME "Port0"
66+
SSP1_PCM_NAME "Port1"
67+
SSP2_PCM_NAME "Port2"
6468
}
6569

6670
# override defaults with platform-specific config
@@ -147,7 +151,7 @@ Object.Pipeline.host-copier-gain-mixin-playback [
147151
Object.Widget.gain.1 {
148152
core_id $SSP0_CORE_ID
149153
Object.Control.mixer.1 {
150-
name 'Playback Volume 1'
154+
name 'Pre Mixer $SSP0_PCM_NAME Playback Volume'
151155
}
152156
}
153157
}
@@ -163,7 +167,7 @@ Object.Pipeline.host-copier-gain-mixin-playback [
163167
Object.Widget.gain.1 {
164168
core_id $SSP2_CORE_ID
165169
Object.Control.mixer.1 {
166-
name 'Playback Volume 5'
170+
name 'Pre Mixer $SSP2_PCM_NAME Playback Volume'
167171
}
168172
}
169173
Object.Widget.mixin.1 {
@@ -189,7 +193,7 @@ Object.Pipeline.mixout-gain-dai-copier-playback [
189193
Object.Widget.gain.1 {
190194
core_id $SSP0_CORE_ID
191195
Object.Control.mixer.1 {
192-
name 'Main Playback Volume 14'
196+
name 'Post Mixer $SSP0_PCM_NAME Playback Volume'
193197
}
194198
}
195199
}
@@ -209,7 +213,7 @@ Object.Pipeline.mixout-gain-dai-copier-playback [
209213
Object.Widget.gain.1 {
210214
core_id $SSP2_CORE_ID
211215
Object.Control.mixer.1 {
212-
name 'Main Playback Volume 6'
216+
name 'Post Mixer $SSP2_PCM_NAME Playback Volume'
213217
}
214218
}
215219
Object.Widget.mixout.1 {
@@ -292,11 +296,11 @@ Object.Pipeline.io-gateway-capture [
292296

293297
Object.PCM.pcm [
294298
{
295-
name "Port0"
299+
name "$SSP0_PCM_NAME"
296300
id 0
297301
direction "duplex"
298302
Object.Base.fe_dai.1 {
299-
name "Port0"
303+
name "$SSP0_PCM_NAME"
300304
}
301305

302306
Object.PCM.pcm_caps.1 {
@@ -312,11 +316,11 @@ Object.PCM.pcm [
312316
}
313317
}
314318
{
315-
name "Port2"
319+
name "$SSP2_PCM_NAME"
316320
id 2
317321
direction "duplex"
318322
Object.Base.fe_dai.1 {
319-
name "Port2"
323+
name "$SSP2_PCM_NAME"
320324
}
321325

322326
Object.PCM.pcm_caps.1 {
@@ -409,7 +413,7 @@ IncludeByKey.SSP1_ENABLED {
409413
Object.Widget.gain.1 {
410414
core_id $SSP1_CORE_ID
411415
Object.Control.mixer.1 {
412-
name 'Playback Volume 3'
416+
name 'Pre Mixer $SSP1_PCM_NAME Playback Volume'
413417
}
414418
}
415419
Object.Widget.mixin.1 {
@@ -435,7 +439,7 @@ IncludeByKey.SSP1_ENABLED {
435439
Object.Widget.gain.1 {
436440
core_id $SSP1_CORE_ID
437441
Object.Control.mixer.1 {
438-
name 'Main Playback Volume 4'
442+
name 'Post Mixer $SSP1_PCM_NAME Playback Volume'
439443
}
440444
}
441445
Object.Widget.mixout.1 {
@@ -485,11 +489,11 @@ IncludeByKey.SSP1_ENABLED {
485489

486490
Object.PCM.pcm [
487491
{
488-
name "Port1"
492+
name "$SSP1_PCM_NAME"
489493
id 1
490494
direction "duplex"
491495
Object.Base.fe_dai.1 {
492-
name "Port1"
496+
name "$SSP1_PCM_NAME"
493497
}
494498

495499
Object.PCM.pcm_caps.1 {

0 commit comments

Comments
 (0)