Skip to content

Rename cavs nocodec mixers #7682

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 5 commits into from
May 26, 2023
Merged

Rename cavs nocodec mixers #7682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
64d97a6
topology2: cavs-nocodec.conf: Rename SSP0, SSP1, and SSP2 playback vo…
May 18, 2023
be16eb8
topology2: cavs-nocodec.conf: Rename SSP0 Capture Volumes
May 23, 2023
8db1cbf
topology2: cavs-nocodec.conf: Rename DMIC0 post mux volumes
May 23, 2023
07226fb
topology2: nocodec-ssp0-2level.conf: Rename Port0 Aux Volume
May 22, 2023
b5b0f22
topology2: dmic-generic.conf: Rename generic DMIC volume
May 24, 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
58 changes: 32 additions & 26 deletions tools/topology/topology2/cavs-nocodec.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ Define {
SSP0_MIXER_SOURCE_3 'mixin.21.1'
SSP1_ENABLED "true"
PASSTHROUGH "false"
SSP0_PCM_NAME "Port0"
SSP0_CAPTURE_PCM "ssp-capture"
SSP1_PCM_NAME "Port1"
SSP2_PCM_NAME "Port2"
DMIC0_PCM_0_NAME "DMIC0 Raw"
DMIC0_PCM_1_NAME "DMIC0 Raw 2"
}

# override defaults with platform-specific config
Expand Down Expand Up @@ -180,7 +186,7 @@ IncludeByKey.PASSTHROUGH {
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Playback Volume 1'
name 'Pre Mixer $SSP0_PCM_NAME Playback Volume'
}
}
}
Expand All @@ -193,7 +199,7 @@ IncludeByKey.PASSTHROUGH {
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Playback Volume 5'
name 'Pre Mixer $SSP2_PCM_NAME Playback Volume'
}
}
}
Expand All @@ -213,7 +219,7 @@ IncludeByKey.PASSTHROUGH {

Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Main Playback Volume 2'
name 'Post Mixer $SSP0_PCM_NAME Playback Volume'
}
}

Expand Down Expand Up @@ -248,7 +254,7 @@ IncludeByKey.PASSTHROUGH {

Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Main Playback Volume 6'
name 'Post Mixer $SSP2_PCM_NAME Playback Volume'
}
}
}
Expand All @@ -264,7 +270,7 @@ IncludeByKey.PASSTHROUGH {
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Main Capture Volume 1'
name 'Post Demux $SSP0_PCM_NAME Capture Volume'
}
}
}
Expand All @@ -278,7 +284,7 @@ IncludeByKey.PASSTHROUGH {
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Main Capture Volume 2'
name 'Post Demux $SSP0_CAPTURE_PCM Capture Volume'
}
}
}
Expand Down Expand Up @@ -336,7 +342,7 @@ IncludeByKey.PASSTHROUGH {
out_ch_map $CHANNEL_MAP_3_POINT_1
}
Object.Control.mixer.1 {
name 'Main Capture Volume 3'
name 'Pre Demux $DMIC0_PCM_0_NAME Capture Volume'
}
}
}
Expand Down Expand Up @@ -379,7 +385,7 @@ IncludeByKey.PASSTHROUGH {
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Host Capture Volume'
name 'Pre Demux $SSP0_PCM_NAME Capture Volume'
}
}
}
Expand Down Expand Up @@ -633,7 +639,7 @@ IncludeByKey.PASSTHROUGH {
format $FORMAT
index 18
Object.Widget.pipeline.1 {
stream_name "DMIC0 Raw"
stream_name "$DMIC0_PCM_0_NAME"
}
Object.Widget.host-copier.1 {
stream_name "Gain Capture 18"
Expand Down Expand Up @@ -681,15 +687,15 @@ IncludeByKey.PASSTHROUGH {
out_ch_map $CHANNEL_MAP_3_POINT_1
}
Object.Control.mixer.1 {
name 'Capture Raw Volume 1'
name 'Post Demux $DMIC0_PCM_0_NAME Capture Volume'
}
}
}
{
format $FORMAT
index 20
Object.Widget.pipeline.1 {
stream_name "DMIC0 Raw 2"
stream_name "$DMIC0_PCM_1_NAME"
}
Object.Widget.host-copier.1 {
stream_name "Gain Capture 20"
Expand Down Expand Up @@ -737,7 +743,7 @@ IncludeByKey.PASSTHROUGH {
out_ch_map $CHANNEL_MAP_3_POINT_1
}
Object.Control.mixer.1 {
name 'Capture Raw Volume 2'
name 'Post Demux $DMIC0_PCM_1_NAME Capture Volume'
}
}
}
Expand All @@ -747,11 +753,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 {
Expand All @@ -767,11 +773,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 All @@ -792,22 +798,22 @@ IncludeByKey.PASSTHROUGH {
"false" {
Object.PCM.pcm [
{
name "ssp-capture"
name "$SSP0_CAPTURE_PCM"
id 12
direction "capture"
Object.Base.fe_dai.1 {
name "ssp-capture"
name "$SSP0_CAPTURE_PCM"
}
Object.PCM.pcm_caps.1 {
name "SSP0-1 Capture"
formats 'S16_LE,S24_LE,S32_LE'
}
}
{
name "DMIC0 Raw"
name "$DMIC0_PCM_0_NAME"
id 27
direction "capture"
Object.Base.fe_dai."DMIC0 Raw" {}
Object.Base.fe_dai."$DMIC0_PCM_0_NAME" {}

Object.PCM.pcm_caps."capture" {
name "Gain Capture 18"
Expand All @@ -818,10 +824,10 @@ IncludeByKey.PASSTHROUGH {
}
}
{
name "DMIC0 Raw 2"
name "$DMIC0_PCM_1_NAME"
id 28
direction "capture"
Object.Base.fe_dai."DMIC0 Raw 2" {}
Object.Base.fe_dai."$DMIC0_PCM_1_NAME" {}

Object.PCM.pcm_caps."capture" {
name "Gain Capture 20"
Expand Down Expand Up @@ -1018,7 +1024,7 @@ IncludeByKey.SSP1_ENABLED {
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Playback Volume 3'
name 'Pre Mixer $SSP1_PCM_NAME Playback Volume'
}
}
}
Expand All @@ -1038,7 +1044,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'
}
}
}
Expand Down Expand Up @@ -1133,11 +1139,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
10 changes: 7 additions & 3 deletions tools/topology/topology2/platform/intel/dmic-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Define {
DMIC0_PCM_NAME "DMIC"
}

Object.Dai.DMIC [
{
dai_index 0
Expand Down Expand Up @@ -121,7 +125,7 @@ IncludeByKey.PASSTHROUGH {
out_ch_map $CHANNEL_MAP_3_POINT_1
}
Object.Control.mixer.1 {
name 'DMIC0 Capture Volume 1'
name '$DMIC0_PCM_NAME Capture Volume'
}
}

Expand Down Expand Up @@ -345,11 +349,11 @@ IncludeByKey.PASSTHROUGH {

Object.PCM.pcm [
{
name "DMIC"
name "$DMIC0_PCM_NAME"
id $DMIC0_PCM_ID
direction "capture"
Object.Base.fe_dai.1 {
name "DMIC"
name "$DMIC0_PCM_NAME"
}

Object.PCM.pcm_caps.1 {
Expand Down
8 changes: 6 additions & 2 deletions tools/topology/topology2/platform/intel/nocodec-ssp0-2level.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Define {
SSP0_AUX_PCM_NAME "Port0 Aux Playback"
}

Object.Pipeline.host-copier-gain-mixin-playback [
{
index $SSP0_MIXER_PIPELINE_ID_2
Expand All @@ -11,7 +15,7 @@ Object.Pipeline.host-copier-gain-mixin-playback [
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Playback Volume 8'
name 'Pre Mixer $SSP0_AUX_PCM_NAME Volume'
}
}
}
Expand All @@ -29,7 +33,7 @@ Object.Pipeline.mixout-mixin [

Object.PCM.pcm [
{
name "Port0 Aux Playback"
name "$SSP0_AUX_PCM_NAME"
id $SSP0_MIXER_PCM_ID_1
direction "playback"
Object.Base.fe_dai."Port0 aux" {}
Expand Down