Skip to content

topology2: nocodec: add volume and mixer support#6499

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
lgirdwood merged 1 commit into from
Oct 28, 2022
Merged

topology2: nocodec: add volume and mixer support #6499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
120 changes: 88 additions & 32 deletions tools/topology/topology2/cavs/cavs-nocodec.conf
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,10 @@
<pdm_config.conf>
<tokens.conf>
<virtual.conf>
<passthrough-playback.conf>
<passthrough-capture.conf>
<passthrough-be.conf>
<host-copier-gain-mixin-playback.conf>
<mixout-gain-dai-copier-playback.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>
Expand DownExpand Up@@ -116,13 +117,36 @@ Object.Dai {
#
# Pipeline definitions
#
# PCM0 ---> gain ----> Mixin ----> Mixout ----> gain ----> SSP0
# PCM1 ---> gain ----> Mixin ----> Mixout ----> gain ----> SSP1
# PCM2 ---> gain ----> Mixin ----> Mixout ----> gain ----> SSP2
#
# SSP0 ----> PCM0
# SSP1 ----> PCM1
# SSP2 ----> PCM2

# Pipeline ID:1 PCM ID: 0
Object.Pipeline {
# playback pipelines
passthrough-be.1 {
index 2
direction playback
host-copier-gain-mixin-playback.1 {
index 1

Object.Widget.pipeline.1 {
stream_name 'NoCodec-0'
}
Object.Widget.copier.1 {
stream_name 'SSP0 Playback'
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Playback Volume 1'
}
}
}

mixout-gain-dai-copier-playback.1 {
index 2

Object.Widget.pipeline.1 {
stream_name 'NoCodec-0'
}
Expand All@@ -134,21 +158,33 @@ Object.Pipeline {
stream_name "NoCodec-0"
node_type $I2S_LINK_OUTPUT_CLASS
}

Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Main Playback Volume 2'
}
}
}

passthrough-playback.1 {
index 1
host-copier-gain-mixin-playback.2 {
index 3

Object.Widget.pipeline.1 {
stream_name 'NoCodec-0'
stream_name 'NoCodec-1'
}
Object.Widget.copier.1 {
stream_name 'SSP0 Playback'
stream_name 'SSP1 Playback'
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Playback Volume 3'
}
}
}

passthrough-be.2 {
mixout-gain-dai-copier-playback.2 {
index 4
direction playback

Object.Widget.pipeline.1 {
stream_name 'NoCodec-1'
}
Expand All@@ -160,21 +196,33 @@ Object.Pipeline {
stream_name "NoCodec-1"
node_type $I2S_LINK_OUTPUT_CLASS
}

Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Main Playback Volume 4'
}
}
}

passthrough-playback.2 {
index 3
host-copier-gain-mixin-playback.3 {
index 5

Object.Widget.pipeline.1 {
stream_name 'NoCodec-1'
stream_name 'NoCodec-2'
}
Object.Widget.copier.1 {
stream_name 'SSP1 Playback'
stream_name 'SSP2 Playback'
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Playback Volume 5'
}
}
}

passthrough-be.3 {
mixout-gain-dai-copier-playback.3 {
index 6
direction playback

Object.Widget.pipeline.1 {
stream_name 'NoCodec-2'
}
Expand All@@ -186,15 +234,11 @@ Object.Pipeline {
stream_name "NoCodec-2"
node_type $I2S_LINK_OUTPUT_CLASS
}
}

passthrough-playback.3 {
index 5
Object.Widget.pipeline.1 {
stream_name 'NoCodec-2'
}
Object.Widget.copier.1 {
stream_name 'SSP2 Playback'
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Main Playback Volume 6'
}
}
}

Expand DownExpand Up@@ -355,33 +399,45 @@ Object.PCM {

Object.Base {
route."1" {
source "copier.host.1.1"
source "gain.2.1"
sink "copier.SSP.2.1"
}

route."2" {
source "copier.host.3.1"
sink "copier.SSP.4.1"
source "mixin.1.1"
sink "mixout.2.1"
}

route."3" {
source "copier.host.5.1"
source "gain.4.1"
sink "copier.SSP.4.1"
}
route."4" {
source "mixin.3.1"
sink "mixout.4.1"
}

route."5" {
source "gain.6.1"
sink "copier.SSP.6.1"
}
route."6" {
source "mixin.5.1"
sink "mixout.6.1"
}

route."4" {
route."7" {
source "copier.SSP.8.1"
sink "copier.host.7.1"
}

route."5" {
route."8" {
source "copier.SSP.10.1"
sink "copier.host.9.1"
}

route."6" {
route."9" {
source "copier.SSP.12.1"
sink "copier.host.11.1"
}

}