diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf index ea30b2607..dc730c1d3 100644 --- a/tools/topology/topology2/cavs-nocodec.conf +++ b/tools/topology/topology2/cavs-nocodec.conf @@ -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 {