Skip to content

Topo2 more mixer name fixes #7704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 3 commits into from
Jun 28, 2023
Merged

Topo2 more mixer name fixes #7704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3e9282
topology2: cavs-mixin-mixout-efx-hda.conf: Improve mixer names
May 28, 2023
d66d3c7
topology2: cavs-mixin-mixout-efx-hda.conf: Rename Iir and Fir Eqs
May 28, 2023
e1d2482
topology2: cavs-nocodec-multicore.conf: Rename playback volumes
May 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ 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 {
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'
}
}
}
Expand All @@ -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'
}
}
}
Expand Down
28 changes: 16 additions & 12 deletions tools/topology/topology2/cavs-nocodec-multicore.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
}
}
}
Expand All @@ -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 {
Expand All @@ -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'
}
}
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down